diff --git a/macro/beamtime/CMakeLists.txt b/macro/beamtime/CMakeLists.txt index 6f5c5649214f13359a95e3c588e19c35ddef21c6..4a20b41b8208c3a157a5215b35fa257aec0cf786 100644 --- a/macro/beamtime/CMakeLists.txt +++ b/macro/beamtime/CMakeLists.txt @@ -5,6 +5,8 @@ add_subdirectory(mcbm2021) add_subdirectory(mcbm2022) # mCBM 2024: install parameter files add_subdirectory(mcbm2024) +# Common scripts/configs for beamtime +add_subdirectory(common) ################################################################################ #--- Deprecated (not running) diff --git a/macro/beamtime/common/.rootrc b/macro/beamtime/common/.rootrc new file mode 100644 index 0000000000000000000000000000000000000000..e20b6c43f21a332e0fd5b28d52a04224f6a645c5 --- /dev/null +++ b/macro/beamtime/common/.rootrc @@ -0,0 +1,4 @@ +# Load the rootalias file from the macro/include directory. +# The file contains some functions which are needed for several different ROOT macros. +# Instead of putting them in all ROOT macros they are defined only once and can be used everywhere. +Rint.Load: $VMCWORKDIR/macro/include/rootalias.C diff --git a/macro/beamtime/common/CMakeLists.txt b/macro/beamtime/common/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..72153848805140d9c87c73810a62af4569d682ad --- /dev/null +++ b/macro/beamtime/common/CMakeLists.txt @@ -0,0 +1,26 @@ + +# ROOT macros, par files, documentation files, bash scripts +Install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DESTINATION share/cbmroot/macro/beamtime + FILES_MATCHING PATTERN "*.C" + PATTERN "*.par" + PATTERN "*.md" + PATTERN "*.sh" + ) +# # RICH calibration file, resolve symlink to get the full file +# get_filename_component(_resolvedRichFile ${CMAKE_CURRENT_SOURCE_DIR}/icd_offset_it_0.data REALPATH) +# Install(FILES ${_resolvedRichFile} +# DESTINATION share/cbmroot/macro/beamtime/mcbm2022 +# ) + +# SLURM scripts, bash scripts +Install(DIRECTORY online + DESTINATION share/cbmroot/macro/beamtime/common + FILES_MATCHING PATTERN "*.sbatch" + PATTERN "*.sh" + ) + +# Just the empty folder for output +Install(DIRECTORY data + DESTINATION share/cbmroot/macro/beamtime/common + PATTERN "*" EXCLUDE) diff --git a/macro/beamtime/mcbm2024/reco_mcbm.sh b/macro/beamtime/common/reco_mcbm.sh similarity index 99% rename from macro/beamtime/mcbm2024/reco_mcbm.sh rename to macro/beamtime/common/reco_mcbm.sh index f004b131b993ba68abf4cfa365f8a1d8b334b348..ac037f0591a8511ff1ab51ad137b41171fed8fb2 100755 --- a/macro/beamtime/mcbm2024/reco_mcbm.sh +++ b/macro/beamtime/common/reco_mcbm.sh @@ -8,6 +8,10 @@ # @since 21.05.2024 # @author Sergei Zharko <s.zharko@gsi.de> # +# TODO: +# - set digi-event input +# - replace mcbm_reco_event_L1.C with a binary +# # ********************************************************************************************************************** # *** User Manual (v. 0.1.0, 22.01.2025) *** # ********************************************************************************************************************** @@ -29,7 +33,7 @@ # - TSA file unpacking [--unpack] # - reconstruction [--reco] # - main QA [--qa] -# - reconstruciton QA (Alex) [--qa-module] +# - reconstruction QA (Alex) [--qa-module] # - KF Particle Finder (Lambda) [--kfpf] # # Required options: @@ -74,7 +78,7 @@ # <kfp.ana>: Output from the lambda analysis: <top_dir>/<label>.kfp.ana.root # [optional] QA file: <top_dir>/<label>.qa.kfp.ana.root # -# 4. Knwon missing features +# 4. Known missing features # # - Script and its sub-process is not killed if CTEST is stopped with CTRL+C # - Error in reco of run 3105: diff --git a/macro/beamtime/mcbm2024/reco_mcbm_job.sh b/macro/beamtime/common/reco_mcbm_job.sh similarity index 100% rename from macro/beamtime/mcbm2024/reco_mcbm_job.sh rename to macro/beamtime/common/reco_mcbm_job.sh diff --git a/macro/beamtime/mcbm2024/CMakeLists.txt b/macro/beamtime/mcbm2024/CMakeLists.txt index 99eb9954c6a9c0998367e1f7a8d18bf6a4bc40c4..b7c7ff3d0b75d7b31452c01ce95698ef2ae1bb02 100644 --- a/macro/beamtime/mcbm2024/CMakeLists.txt +++ b/macro/beamtime/mcbm2024/CMakeLists.txt @@ -48,7 +48,7 @@ If(DEFINED ENV{RAW_DATA_PATH} ) # ============================================================================ # ===== Create test script with all environment needed for the reco chain script - GENERATE_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/mcbm2024/reco_mcbm.sh) + GENERATE_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/common/reco_mcbm.sh) # ============================================================================ ## Run only if raw data files present: 2024 @@ -84,7 +84,7 @@ If(DEFINED ENV{RAW_DATA_PATH} ) ### Complete reco chain script by S. Zharko Set(testname mcbm_2024_unp_${RUN}) Set(fixture_unp_${RUN} fixture_done_${testname}) - Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2024/reco_mcbm.sh + Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/common/reco_mcbm.sh --tsa ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa --nts ${RECO_TS_NB} --setup --unpack @@ -100,7 +100,7 @@ If(DEFINED ENV{RAW_DATA_PATH} ) Set(testname mcbm_2024_rec_${RUN}) Set(fixture_rec_${RUN} fixture_done_${testname}) - Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2024/reco_mcbm.sh + Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/common/reco_mcbm.sh --tsa ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa --nts ${RECO_TS_NB} --reco @@ -115,7 +115,7 @@ If(DEFINED ENV{RAW_DATA_PATH} ) Set(testname mcbm_2024_qa_${RUN}) Set(fixture_qa_${RUN} fixture_done_${testname}) - Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2024/reco_mcbm.sh + Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/common/reco_mcbm.sh --tsa ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa --nts ${RECO_TS_NB} --qa --qa-module