From 6289c1351f27fa7c94f329d60fba39c2a4e221b2 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 3 Aug 2021 14:17:31 +0200
Subject: [PATCH] Add CheckTiming of 2021 data to test set
---
macro/beamtime/mcbm2021/check_timing_any.C | 2 +-
macro/run/CMakeLists.txt | 17 ++++++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/macro/beamtime/mcbm2021/check_timing_any.C b/macro/beamtime/mcbm2021/check_timing_any.C
index 50ab2ff9ea..7c9cab21f1 100644
--- a/macro/beamtime/mcbm2021/check_timing_any.C
+++ b/macro/beamtime/mcbm2021/check_timing_any.C
@@ -110,7 +110,7 @@ void check_timing_any(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TS
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
cout << endl << endl;
- cout << "Macro finished succesfully." << endl;
+ cout << "Macro finished successfully." << endl;
cout << "Real time " << rtime << " s, CPU time " << ctime << " s" << endl;
cout << endl;
// ------------------------------------------------------------------------
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 2b8cadc5af..b110b5e1b6 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -244,6 +244,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
## Generate scripts
GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/run/run_unpack_tsa.C ) # Unpackers
+ GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/mcbm2021/check_timing_any.C ) # Check Timing
## Run only if raw data files present
ForEach(RUN 1588 )
Message( STATUS "Checking if raw data file exists: ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa" )
@@ -251,16 +252,26 @@ If(DEFINED ENV{RAW_DATA_PATH} )
Message( STATUS "Raw data file found, tests will be performed for mCBM run ${RUN}" )
## Define tests + dependencies
- ### Raw data analysis tests
+ ### Raw data analysis tests: unpacking
Set(testname mcbm_unpack_2021_${RUN})
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_unpack_tsa.sh \"${RAW_DATA_PATH}/${RUN}_first20Ts.tsa\" ${RUN} \"mcbm_beam_2021_03\" -1 \"data/\")
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully")
set_tests_properties(${testname} PROPERTIES DEPENDS run_cleanup)
- set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED run_cleanup)
+ set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED cleanup)
Set(fixture_unpacked_${RUN} fixture_done_${testname})
set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_unpacked_${RUN}})
- EndIf() # If(EXISTS ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa))
+
+ ### Raw data analysis tests: time offsets check
+ Set(testname mcbm_chktime_2021_${RUN})
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2021/check_timing_any.sh \"${CBMROOT_BINARY_DIR}/macro/run/data/${RUN}_first20Ts.digi.root\" ${RUN})
+ Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
+ Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully")
+ set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_unpack_2021_${RUN})
+ set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_unpacked_${RUN}})
+ Set(fixture_chktime_${RUN} fixture_done_${testname})
+ set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_chktime_${RUN}})
+ EndIf() # If(EXISTS ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa))
EndForEach() # ForEach(RUN 1588 )
EndIf() # If(DEFINED ENV{RAW_DATA_PATH} )
#####################
--
GitLab