Commit 673c7c8a authored by Miroslav Shaltev's avatar Miroslav Shaltev
Browse files

continue work on hybrid search

parent 42f1e16f
......@@ -725,6 +725,11 @@ int main(int argc, char *argv[]) {
MFCSearch->Cohmetric(g);
}
if (MFCSearch->HybridSearch()) {
MFCSearch->HybridSearchCreateLattice(MFCSearch->Cohmetric(),MFCSearch->HybridSearchMismatch(),MFCSearch->HybridSearchLattice());
}
NOMAD::Display out ( std::cout );
out.precision ( NOMAD::DISPLAY_PRECISION_STD );
try {
......@@ -859,6 +864,9 @@ int main(int argc, char *argv[]) {
MFCSearch->SaveMetric(MFCSearch->MetricFile(SCStage,SCMETRIC),MFCSearch->Semicohmetric());
}
if (MFCSearch->HybridSearch()) {
MFCSearch->HybridSearchCreateLattice(MFCSearch->Semicohmetric(),MFCSearch->HybridSearchMismatch(),MFCSearch->HybridSearchLattice());
}
gsl_matrix *stage_sc_metric = gsl_matrix_calloc(MFCSearch->DimMetric(MFCSearch->SType(),USETYPE_SEARCH),MFCSearch->DimMetric(MFCSearch->SType(),USETYPE_SEARCH));
......@@ -1067,6 +1075,10 @@ int main(int argc, char *argv[]) {
MFCSearch->write_dts_file();
}
if (MFCSearch->HybridSearch()) {
MFCSearch->HybridSearchCreateLattice(MFCSearch->Cohmetric(),MFCSearch->HybridSearchMismatch(),MFCSearch->HybridSearchLattice());
}
if (MFCSearch->FinalMinMeshCoarseningExponent() != 0 && MFCSearch->FinalMaxMeshCoarseningExponent() != 0) {
LogPrintf(LOG_NORMAL,"Perform fully-coherent search: %d\n",MFCSearch->Search());
......@@ -1942,7 +1954,12 @@ INT4 FCSearch::XLALInitUserVars ( int argc, char *argv[] )
RestrictionType(PITYPEMETRIC);
dopplermax(uvar->dopplermax);
HybridSearch(uvar->HybridSearch);
HybridSearchMismatch(uvar->HybridSearchMismatch);
HybridSearchLattice(uvar->HybridSearchLattice);
HybridSearchPoints(uvar->HybridSearchPoints);
dopplermax(uvar->dopplermax);
if ( uvar->ComputeDTS && uvar->FStatSearchType == CHSEARCH ) {
DTS.clear();
......
......@@ -3242,7 +3242,7 @@ void FStatNomad::HybridSearchCreateLattice(gsl_matrix *g, REAL4 m,CHAR *lattice)
LatticeTiling *tiling = NULL;
tiling = XLALCreateLatticeTiling(SType());
tiling = XLALCreateLatticeTiling(DimMetric(SType(),USETYPE_SEARCH));
XLAL_CHECK_MAIN(tiling != NULL, XLAL_EFUNC);
......@@ -3266,7 +3266,7 @@ void FStatNomad::HybridSearchCreateLattice(gsl_matrix *g, REAL4 m,CHAR *lattice)
// Print number of templates
UINT8 ntemplates = XLALTotalLatticeTilingPoints(itr);
XLAL_CHECK_MAIN(ntemplates > 0, XLAL_EFUNC);
printf("%" LAL_UINT8_FORMAT "\n", ntemplates);
printf("HybridSearch total number of templates: %" LAL_UINT8_FORMAT "\n", ntemplates);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment