From 791f6317dd641819811226cde10c357604743f93 Mon Sep 17 00:00:00 2001 From: Oleksii Lubynets <lubynets@lxbk0198.gsi.de> Date: Wed, 16 Sep 2020 12:18:23 +0200 Subject: [PATCH] fix macro test, return PV find mode default --- macro/C2F/CMakeLists.txt | 2 +- macro/analysis/common/at_kfpf_interface/run_at_kfpf.C | 5 +++++ reco/KF/CbmKFParticleFinder.cxx | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/macro/C2F/CMakeLists.txt b/macro/C2F/CMakeLists.txt index 55e96e0f52..afc72532a8 100644 --- a/macro/C2F/CMakeLists.txt +++ b/macro/C2F/CMakeLists.txt @@ -78,7 +78,7 @@ If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) ) Add_Test(${testname} ${MACRO_DIR}/run_at_kfpf.sh ${NumEvents} \"data/${setup}_test\") Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300") Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok") - set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_c2f_ana}) + set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_c2f_analysistree}) Set(fixture_c2f_at_kfpf_interface fixture_c2f_at_kfpf_interface_${testname}) set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_c2f_at_kfpf_interface}) diff --git a/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C b/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C index 194f23ddc7..bfc360d970 100644 --- a/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C +++ b/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C @@ -15,4 +15,9 @@ void run_at_kfpf(int nEntries = -1, man.SetCuts(cuts); man.Run(nEntries); + + // ----- Finish ------------------------------------------------------- + std::cout << " Test passed" << std::endl; + std::cout << " All ok " << std::endl; + } diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx index e6133a3e2e..173f9739b4 100644 --- a/reco/KF/CbmKFParticleFinder.cxx +++ b/reco/KF/CbmKFParticleFinder.cxx @@ -37,7 +37,7 @@ CbmKFParticleFinder::CbmKFParticleFinder(const char* name, Int_t iVerbose) , fTrackArray(0) , fEvents(0) , fTopoReconstructor(0) - , fPVFindMode(3) + , fPVFindMode(2) , fPID(0) , fSuperEventAnalysis(0) , fSETracks(0) -- GitLab