Skip to content
GitLab
Commit ab962e62 authored by Administrator's avatar Administrator
Browse files

Only run working tests 

Remove all unneded test from test suite.
Only run local Sts reconstruction in run_reco.C.
parent a2576f5c
Hide whitespace changes
Inline Side-by-side
macro/reco/CMakeLists.txt
View file @ ab962e62
......@@ -34,8 +34,13 @@ set(datadir ${CBMROOT_BINARY_DIR}/macro/reco/data)
# ===== Define the different setups to be tested with ====================
if(NOT ${CBM_TEST_MODEL} MATCHES Experimental )
List(APPEND cbm_setup sis100_hadron sis100_electron sis100_muon_lmvm
sis100_muon_jpsi sis300_electron)
List(APPEND cbm_setup
# sis100_hadron
sis100_electron
# sis100_muon_lmvm
# sis100_muon_jpsi
# sis300_electron
)
else()
List(APPEND cbm_setup sis100_hadron)
endif()
......
macro/run/CMakeLists.txt
View file @ ab962e62
......@@ -40,11 +40,11 @@ math(EXPR nBeam "${nEvents} * 3")
# ===== Define the different setups to be tested with ====================
if(NOT ${CBM_TEST_MODEL} MATCHES Experimental )
List(APPEND cbm_setup
sis100_hadron
# sis100_hadron
sis100_electron
sis100_muon_lmvm
sis100_muon_jpsi
sis300_electron
# sis100_muon_lmvm
# sis100_muon_jpsi
# sis300_electron
)
else()
List(APPEND cbm_setup sis100_electron sis100_muon_jpsi)
......@@ -167,21 +167,21 @@ foreach(setup IN LISTS cbm_setup)
# --- Test run_digi_ts
# --- Detector response simulation, time-based, using run_digi.C
set(testname run_${sname}_digi_ts)
set(eventrate 1.e7)
set(beamrate 1.e7)
set(tslength 1.e6)
add_test(${testname} ${MACRO_DIR}/run_digi.sh
\"data/${sname}_coll\" -1 \"data/${sname}_ts\"\ ${eventrate} ${tslength}
\"data/${sname}_sign\" \"data/${sname}_beam\" ${beamrate})
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_tra_sign_${setup};fixt_tra_beam_${setup}"
FIXTURES_SETUP fixt_digi_ts_${setup}
RESOURCE_LOCK collParDb_${setup}
)
# set(testname run_${sname}_digi_ts)
# set(eventrate 1.e7)
# set(beamrate 1.e7)
# set(tslength 1.e6)
# add_test(${testname} ${MACRO_DIR}/run_digi.sh
# \"data/${sname}_coll\" -1 \"data/${sname}_ts\"\ ${eventrate} ${tslength}
# \"data/${sname}_sign\" \"data/${sname}_beam\" ${beamrate})
# set_tests_properties(${testname} PROPERTIES
# TIMEOUT ${timeOutTime}
# FAIL_REGULAR_EXPRESSION "segmentation violation"
# PASS_REGULAR_EXPRESSION "Macro finished successfully"
# FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_tra_sign_${setup};fixt_tra_beam_${setup}"
# FIXTURES_SETUP fixt_digi_ts_${setup}
# RESOURCE_LOCK collParDb_${setup}
# )
# --- Test check_radlen.sh
# --- Transport run with collision events, using run_tra_file.C
......@@ -228,66 +228,66 @@ foreach(setup IN LISTS cbm_setup)
# --- Test run_reco_ts_eb_ideal
# --- Event-by-event reconstruction from time-based simulation
# --- Ideal raw event builder
set(testname run_${sname}_reco_ts_eb_ideal)
add_test(${testname} ${MACRODIR}/run_reco.sh
\"data/${sname}_ts\" -1 0 \"data/${sname}_ts_eb_ideal\" \"Ideal\" \"${setup}\"
\"data/${sname}_coll\")
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
FIXTURES_SETUP fixt_reco_ts_eb_ideal_${setup}
RESOURCE_LOCK collParDb_${setup}
)
# set(testname run_${sname}_reco_ts_eb_ideal)
# add_test(${testname} ${MACRODIR}/run_reco.sh
# \"data/${sname}_ts\" -1 0 \"data/${sname}_ts_eb_ideal\" \"Ideal\" \"${setup}\"
# \"data/${sname}_coll\")
# set_tests_properties(${testname} PROPERTIES
# TIMEOUT ${timeOutTime}
# FAIL_REGULAR_EXPRESSION "segmentation violation"
# PASS_REGULAR_EXPRESSION "Macro finished successfully"
# FIXTURES_REQUIRED fixt_digi_ts_${setup}
# FIXTURES_SETUP fixt_reco_ts_eb_ideal_${setup}
# RESOURCE_LOCK collParDb_${setup}
# )
# --- Test run_reco_ts_eb_real
# --- Event-by-event reconstruction from time-based simulation
# --- Real raw event builder
set(testname run_${sname}_reco_ts_eb_real)
add_test(${testname} ${MACRODIR}/run_reco.sh
\"data/${sname}_ts\" -1 0 \"data/${sname}_ts_eb_real\" \"Real\" \"${setup}\"
\"data/${sname}_coll\")
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
FIXTURES_SETUP fixt_reco_ts_eb_real_${setup}
RESOURCE_LOCK collParDb_${setup}
)
# set(testname run_${sname}_reco_ts_eb_real)
# add_test(${testname} ${MACRODIR}/run_reco.sh
# \"data/${sname}_ts\" -1 0 \"data/${sname}_ts_eb_real\" \"Real\" \"${setup}\"
# \"data/${sname}_coll\")
# set_tests_properties(${testname} PROPERTIES
# TIMEOUT ${timeOutTime}
# FAIL_REGULAR_EXPRESSION "segmentation violation"
# PASS_REGULAR_EXPRESSION "Macro finished successfully"
# FIXTURES_REQUIRED fixt_digi_ts_${setup}
# FIXTURES_SETUP fixt_reco_ts_eb_real_${setup}
# RESOURCE_LOCK collParDb_${setup}
# )
# --- Test run_qa
# --- Run QA tasks with Event-by-event reconstruction from time-based simulation
# --- Real raw event builder
set(testname run_${sname}_qa)
add_test(${testname} ${MACRODIR}/run_qa.sh
\"data/${sname}_coll\" \"data/${sname}_ts\" \"data/${sname}_ts_eb_real\"
\"data/${sname}_coll\" \"data/${sname}_qa\" \"${setup}\" -1
\"data/${sname}_sign\" \"data/${sname}_beam\" )
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}"
FIXTURES_SETUP fixt_qa_${setup}
RESOURCE_LOCK collParDb_${setup}
)
# set(testname run_${sname}_qa)
# add_test(${testname} ${MACRODIR}/run_qa.sh
# \"data/${sname}_coll\" \"data/${sname}_ts\" \"data/${sname}_ts_eb_real\"
# \"data/${sname}_coll\" \"data/${sname}_qa\" \"${setup}\" -1
# \"data/${sname}_sign\" \"data/${sname}_beam\" )
# set_tests_properties(${testname} PROPERTIES
# TIMEOUT ${timeOutTime}
# FAIL_REGULAR_EXPRESSION "segmentation violation"
# PASS_REGULAR_EXPRESSION "Macro finished successfully"
# FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}"
# FIXTURES_SETUP fixt_qa_${setup}
# RESOURCE_LOCK collParDb_${setup}
# )
# --- Test run_reco_ts_tb
# --- Time-based reconstruction from time-based simulation
set(testname run_${sname}_reco_ts_tb)
add_test(${testname} ${MACRODIR}/run_reco.sh
\"data/${sname}_ts\" -1 0 \"data/${sname}_ts_tb\" \"\" \"${setup}\"
\"data/${sname}_coll\")
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
FIXTURES_SETUP fixt_reco_ts_tb_${setup}
RESOURCE_LOCK collParDb_${setup}
)
# set(testname run_${sname}_reco_ts_tb)
# add_test(${testname} ${MACRODIR}/run_reco.sh
# \"data/${sname}_ts\" -1 0 \"data/${sname}_ts_tb\" \"\" \"${setup}\"
# \"data/${sname}_coll\")
# set_tests_properties(${testname} PROPERTIES
# TIMEOUT ${timeOutTime}
# FAIL_REGULAR_EXPRESSION "segmentation violation"
# PASS_REGULAR_EXPRESSION "Macro finished successfully"
# FIXTURES_REQUIRED fixt_digi_ts_${setup}
# FIXTURES_SETUP fixt_reco_ts_tb_${setup}
# RESOURCE_LOCK collParDb_${setup}
# )
endforeach(setup IN LISTS cbm_setup)
......
macro/run/run_reco.C
View file @ ab962e62
......@@ -264,6 +264,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
// ----- Local reconstruction in MVD ----------------------------------
/*
if (useMvd) {
CbmMvdClusterfinder* mvdCluster = new CbmMvdClusterfinder("MVD Cluster Finder", 0, 0);
run->AddTask(mvdCluster);
......@@ -274,6 +275,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
run->AddTask(mvdHit);
std::cout << "-I- " << myName << ": Added task " << mvdHit->GetName() << std::endl;
}
*/
// ------------------------------------------------------------------------
......@@ -289,15 +291,18 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
// ----- Local reconstruction in RICH ---------------------------------
/*
if (useRich) {
CbmRichHitProducer* richHitProd = new CbmRichHitProducer();
run->AddTask(richHitProd);
std::cout << "-I- " << myName << ": Added task " << richHitProd->GetName() << std::endl;
}
*/
// ------------------------------------------------------------------------
// ----- Local reconstruction in MUCH ---------------------------------
/*
if (useMuch) {
// --- Parameter file name
......@@ -318,10 +323,12 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
std::cout << "-I- " << myName << ": Added task " << muchReco->GetName() << " with parameter file " << parFile
<< std::endl;
}
*/
// ------------------------------------------------------------------------
// ----- Local reconstruction in TRD ----------------------------------
/*
if (useTrd) {
Double_t triggerThreshold = 0.5e-6; // SIS100
......@@ -344,10 +351,12 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
run->AddTask(trdHit);
std::cout << "-I- " << myName << ": Added task " << trdHit->GetName() << std::endl;
}
*/
// ------------------------------------------------------------------------
// ----- Local reconstruction in TOF ----------------------------------
/*
if (useTof) {
CbmTofSimpClusterizer* tofCluster = new CbmTofSimpClusterizer("TOF Simple Clusterizer", 0);
tofCluster->SetOutputBranchPersistent("TofHit", kTRUE);
......@@ -355,22 +364,27 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
run->AddTask(tofCluster);
std::cout << "-I- " << myName << ": Added task " << tofCluster->GetName() << std::endl;
}
*/
// ------------------------------------------------------------------------
// ----- Local reconstruction in PSD ----------------------------------
/*
if (usePsd) {
CbmPsdHitProducer* psdHit = new CbmPsdHitProducer();
run->AddTask(psdHit);
std::cout << "-I- " << myName << ": Added task " << psdHit->GetName() << std::endl;
}
*/
// ------------------------------------------------------------------------
/*
if (debugWithMC) {
CbmMatchRecoToMC* match1 = new CbmMatchRecoToMC();
run->AddTask(match1);
}
*/
// ----- Track finding in STS (+ MVD) --------------------------------
/*
if (useMvd || useSts) {
run->AddTask(new CbmTrackingDetectorInterfaceInit()); // Geometry interface initializer for tracker
......@@ -413,6 +427,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
std::cout << "-I- " << myName << ": Added task " << stsFindTracks->GetName() << std::endl;
}
}
*/
// ------------------------------------------------------------------------
......@@ -422,6 +437,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
// ==== reconstruction, a track-based event finder is used; no global
// ==== tracks are produced.
/*
if (eventBased) {
// ----- Primary vertex finding -------------------------------------
......@@ -468,6 +484,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
// ----------------------------------------------------------------------
} //? time-based reco
*/
// ----- Parameter database --------------------------------------------
std::cout << std::endl << std::endl;
......
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