From 60a239f42fc7459898ad4613a8a74f25a874218c Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Sat, 19 Dec 2020 13:15:25 +0100
Subject: [PATCH] Fix weekly tests in macro/KF
The test suite was broken since the run_digi macro was changed some weeks
ago. Also the check for return strings was wrong in two cases. Also use the
proper namespace in the macro.
---
macro/KF/CMakeLists.txt | 7 ++++---
macro/KF/kf_kfparticle.C | 10 +++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/macro/KF/CMakeLists.txt b/macro/KF/CMakeLists.txt
index 721f22e940..e802033fca 100644
--- a/macro/KF/CMakeLists.txt
+++ b/macro/KF/CMakeLists.txt
@@ -121,14 +121,15 @@ ForEach(iSignal RANGE 16)
# --- Digitisation run, event-by-event (uses run/run_digi.C)
Set(testname KF_digi_${title})
- Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_digi.sh ${NSignalEvents} \"${WORKDIR}/${title}_test\" 0. 0. 1)
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_digi.sh \"${WORKDIR}/${title}_test\" -1 \"${WORKDIR}/${title}_test.event\" -1.)
Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1400")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
+ Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully.")
Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_transport})
Set(fixture_digi fixture_digi_${testname})
Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi})
+
# --- Reconstruction run, event-by-event, with MC input, no PV finder (uses run/run_reco_event.C)
Set(testname KF_reco_${title})
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_reco_event.sh ${NSignalEvents} \"${WORKDIR}/${title}_test\" \"${setup}\" kTRUE kFALSE)
@@ -144,7 +145,7 @@ ForEach(iSignal RANGE 16)
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/kf_kfparticle.sh ${NSignalEvents} \"${setup}\" \"${WORKDIR}/${title}_test\" kFALSE kFALSE ${id})
Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1000")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
+ Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully.")
Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_reco})
Set(fixture_kfparticle fixture_kfparticle_${testname})
Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_kfparticle})
diff --git a/macro/KF/kf_kfparticle.C b/macro/KF/kf_kfparticle.C
index 64758a3e63..634f936bb7 100644
--- a/macro/KF/kf_kfparticle.C
+++ b/macro/KF/kf_kfparticle.C
@@ -129,14 +129,14 @@ void kf_kfparticle(Int_t nEvents = 2,
CbmKF* KF = new CbmKF();
run->AddTask(KF);
CbmL1* l1 = new CbmL1("CbmL1", 1, 3);
- if (setup->IsActive(kMvd)) {
- setup->GetGeoTag(kMvd, geoTag);
+ if (setup->IsActive(ECbmModuleId::kMvd)) {
+ setup->GetGeoTag(ECbmModuleId::kMvd, geoTag);
const TString mvdMatBudgetFileName =
paramDir + "/mvd/mvd_matbudget_" + geoTag + ".root";
l1->SetMvdMaterialBudgetFileName(mvdMatBudgetFileName.Data());
}
- if (setup->IsActive(kSts)) {
- setup->GetGeoTag(kSts, geoTag);
+ if (setup->IsActive(ECbmModuleId::kSts)) {
+ setup->GetGeoTag(ECbmModuleId::kSts, geoTag);
const TString stsMatBudgetFileName =
paramDir + "/sts/sts_matbudget_" + geoTag + ".root";
l1->SetStsMaterialBudgetFileName(stsMatBudgetFileName.Data());
@@ -149,7 +149,7 @@ void kf_kfparticle(Int_t nEvents = 2,
kfParticleFinderPID->SetSIS100();
if (useDetectorPID) {
kfParticleFinderPID->UseDetectorPID();
- if (setup->IsActive(kMuch)) {
+ if (setup->IsActive(ECbmModuleId::kMuch)) {
kfParticleFinderPID->UseMuch();
kfParticleFinderPID->SetNMinStsHitsForMuon(7);
kfParticleFinderPID->SetNMinMuchHitsForLMVM(10);
--
GitLab