moved reco_mcbm.sh to beamtime/common

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)

macro/beamtime/common/.rootrc

+# 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

macro/beamtime/common/CMakeLists.txt

+
+# 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)

macro/beamtime/mcbm2024/reco_mcbm.sh → 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:

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