diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt index d75435c142070245362dd897c83a59db2f235f3a..88281aabebf9b099e6fe08f0dc11dbfed73e8bbd 100644 --- a/macro/run/CMakeLists.txt +++ b/macro/run/CMakeLists.txt @@ -335,7 +335,7 @@ EndIf() # If(DEFINED ENV{RAW_DATA_PATH} ) # ============================================================================ Install(FILES .rootrc run_tra_file.C run_tra_beam.C run_transport_json_config.C run_digi_json_config.C config.json - run_digi.C run_reco.C run_unpack_online.C run_unpack_tsa.C + run_digi.C run_reco.C run_unpack_online.C run_unpack_tsa.C config_ci.json DESTINATION share/cbmroot/macro/run ) Install(PROGRAMS run_tests.sh diff --git a/macro/run/config_ci.json b/macro/run/config_ci.json index bac0abc9ec159cbaaeb2d53508bef950fde03e09..0c75e9bc98a1fd9698e45b43d4bef9f5e0b3f9b9 100644 --- a/macro/run/config_ci.json +++ b/macro/run/config_ci.json @@ -107,7 +107,7 @@ ], "output": { "path": "data/test_json", - "overwrite": false + "overwrite": true }, "geometry": { "deactivate": ["", ""], diff --git a/macro/run/run_tests.sh b/macro/run/run_tests.sh index 9c0984e1dab0cdbd9299c5c1264174a3980c512d..cb3fb4f1bc7ecf54ee48c5345b65ed69619dbad2 100644 --- a/macro/run/run_tests.sh +++ b/macro/run/run_tests.sh @@ -24,7 +24,7 @@ main () { check_string="Macro finished successfully" input=${VMCWORKDIR}/input/urqmd.auau.10gev.centr.root - execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_coll\", \"${setup}\")" \ + execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_coll\", \"${setup}\", kGeant3, 1, kTRUE)" \ $log_file_name \ $check_string @@ -33,7 +33,7 @@ main () { check_string="Macro finished successfully" input=${VMCWORKDIR}/input/pluto.auau.8gev.omega.mpmm.0001.root - execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_sign\", \"${setup}\")" \ + execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_sign\", \"${setup}\", kGeant3, 1, kTRUE)" \ $log_file_name \ $check_string @@ -41,14 +41,14 @@ main () { log_file_name=data/run_tra_beam.log check_string="Macro finished successfully" - execute_macro "run_tra_beam.C(${nBeam}, \"Au\", 10, -1, \"data/${sname}_beam\", \"${setup}\")" \ + execute_macro "run_tra_beam.C(${nBeam}, \"Au\", 10, -1, \"data/${sname}_beam\", \"${setup}\", kGeant3, 1, kTRUE)" \ $log_file_name \ $check_string log_file_name=data/run_tra_json.log check_string="Macro finished successfully" - execute_macro "run_transport_json_config.C" \ + execute_macro "run_transport_json_config.C(\"config_ci.json\")" \ $log_file_name \ $check_string @@ -56,7 +56,7 @@ main () { log_file_name=data/run_digi_json.log check_string="Macro finished successfully" - execute_macro "run_digi_json_config.C" \ + execute_macro "run_digi_json_config.C(\"config_ci.json\")" \ $log_file_name \ $check_string