From 01e5e5aeaf5f2740bfcb5049a0e8ddb7ecf92505 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 8 Feb 2022 18:42:19 +0100
Subject: [PATCH] Fix CI
Allow to overwrite existing files. This is needed for the CI since the rerun
of failing transport macros wil fail otherwise in any case due to the already
existing output file.
The default setting in the transport macros is to not overwrite existing
files. The CI uses a paramter to change the default.
---
macro/KF/CMakeLists.txt | 63 ++++++++++++++++++++------------
macro/dimuon/CMakeLists.txt | 64 +++++++++++++++++++++------------
macro/dimuon/dimuon_transport.C | 4 +--
macro/mcbm/CMakeLists.txt | 2 +-
macro/mcbm/mcbm_transport.C | 4 +--
macro/much/run_transport.C | 4 +--
macro/reco/CMakeLists.txt | 6 ++--
macro/run/CMakeLists.txt | 29 ++-------------
macro/run/config_ci.json | 2 +-
macro/run/run_tra_beam.C | 4 +--
macro/run/run_tra_file.C | 5 +--
11 files changed, 101 insertions(+), 86 deletions(-)
diff --git a/macro/KF/CMakeLists.txt b/macro/KF/CMakeLists.txt
index 3a3e2a4217..dbac328cee 100644
--- a/macro/KF/CMakeLists.txt
+++ b/macro/KF/CMakeLists.txt
@@ -78,6 +78,14 @@ List(APPEND signalSetup sis100_electron # 0
sis100_electron # 16
)
+# ===== Cleanup the data directory =======================================
+add_test(kf_cleanup ${CMAKE_COMMAND}
+ -P ${CMAKE_SOURCE_DIR}/cmake/scripts/cleanmacrodir.cmake)
+set_tests_properties(kf_cleanup PROPERTIES
+ TIMEOUT 10
+ FIXTURES_SETUP kf_cleanup
+)
+
ForEach(iSignal RANGE 16)
# The test dependencies are set such that parallel execution is prevented, even is there is no logical
@@ -106,49 +114,58 @@ ForEach(iSignal RANGE 16)
# --- For the input, not the files generated in the previous step but those predefined in the
# --- reference directory are taken, to provide a better test stability.
Set(testname KF_transport_${title})
+ Set(fixture_transport fixture_transport_${testname})
# Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/kf_transport.sh ${NSignalEvents} \"${setup}\"
# \"${WORKDIR}/${title}_test\" \"${WORKDIR}/${title}_test_Signal.root\" ${id})
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/kf_transport.sh ${NSignalEvents} \"${setup}\"
\"${WORKDIR}/${title}_test\"
\"${CBMROOT_SOURCE_DIR}/input/qa/KF/reference/input/${title}_test_Signal.root\"
${id})
- Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1000")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
+ Set_Tests_Properties(${testname} PROPERTIES
+ WORKING_DIRECTORY ${WORKDIR}
+ TIMEOUT "1000"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED kf_cleanup
# Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_generator})
- Set(fixture_transport fixture_transport_${testname})
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_transport})
+ FIXTURES_SETUP ${fixture_transport}
+ )
# --- Digitisation run, event-by-event (uses run/run_digi.C)
Set(testname KF_digi_${title})
- Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_digi.sh \"${WORKDIR}/${title}_test\" -1 \"${WORKDIR}/${title}_test.event\" -1.)
- Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1400")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully.")
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_transport})
Set(fixture_digi fixture_digi_${testname})
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi})
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_digi.sh \"${WORKDIR}/${title}_test\" -1 \"${WORKDIR}/${title}_test.event\" -1.)
+ Set_Tests_Properties(${testname} PROPERTIES
+ WORKING_DIRECTORY ${WORKDIR}
+ TIMEOUT "1400"
+ PASS_REGULAR_EXPRESSION "Macro finished successfully."
+ FIXTURES_REQUIRED ${fixture_transport}
+ FIXTURES_SETUP ${fixture_digi}
+ )
# --- Reconstruction run, event-by-event, with MC input, no PV finder (uses run/run_reco_event.C)
Set(testname KF_reco_${title})
- Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_reco_event.sh ${NSignalEvents} \"${WORKDIR}/${title}_test\" \"${setup}\" kTRUE kFALSE)
- Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1000")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi})
Set(fixture_reco fixture_reco_${testname})
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_reco})
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/run_reco_event.sh ${NSignalEvents} \"${WORKDIR}/${title}_test\" \"${setup}\" kTRUE kFALSE)
+ Set_Tests_Properties(${testname} PROPERTIES
+ WORKING_DIRECTORY ${WORKDIR}
+ TIMEOUT "1000"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED ${fixture_digi}
+ FIXTURES_SETUP ${fixture_reco}
+ )
# --- KF Particle Finder run, event-by-event, with MC pid (uses KF/kf_kfparticle.C)
Set(testname KF_kfparticle_${title})
- Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/kf_kfparticle.sh ${NSignalEvents} \"${setup}\" \"${WORKDIR}/${title}_test\" kFALSE kFALSE ${id})
- Set_Tests_Properties(${testname} PROPERTIES WORKING_DIRECTORY ${WORKDIR})
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1000")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully.")
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_reco})
Set(fixture_kfparticle fixture_kfparticle_${testname})
- Set_Tests_Properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_kfparticle})
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/KF/kf_kfparticle.sh ${NSignalEvents} \"${setup}\" \"${WORKDIR}/${title}_test\" kFALSE kFALSE ${id})
+ Set_Tests_Properties(${testname} PROPERTIES
+ WORKING_DIRECTORY ${WORKDIR}
+ TIMEOUT "1000"
+ PASS_REGULAR_EXPRESSION "Macro finished successfully."
+ FIXTURES_REQUIRED ${fixture_reco}
+ FIXTURES_SETUP ${fixture_kfparticle}
+ )
EndForEach(iSignal)
diff --git a/macro/dimuon/CMakeLists.txt b/macro/dimuon/CMakeLists.txt
index 89ad599c06..8a907ba74f 100644
--- a/macro/dimuon/CMakeLists.txt
+++ b/macro/dimuon/CMakeLists.txt
@@ -17,6 +17,15 @@ Set(NumEvents 1000)
# Define the different setups to be tested
List(APPEND cbm_setup sis100_muon_lmvm)
+# ===== Cleanup the data directory =======================================
+add_test(dimuon_cleanup ${CMAKE_COMMAND}
+ -P ${CMAKE_SOURCE_DIR}/cmake/scripts/cleanmacrodir.cmake)
+set_tests_properties(dimuon_cleanup PROPERTIES
+ TIMEOUT 10
+ FIXTURES_SETUP dimuon_cleanup
+)
+
+
ForEach(setup IN LISTS cbm_setup)
# The test dependencies are set such that parallel execution is prevented, even is there is no logical
@@ -26,46 +35,57 @@ ForEach(setup IN LISTS cbm_setup)
# --- Transport run, using run_transport.C
Set(testname dimuon_transport_${setup})
- Add_Test(${testname} ${MACRO_DIR}/dimuon_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
Set(fixture_dimuon_digi fixture_dimuon_digi_${testname})
- set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_dimuon_digi})
+ Add_Test(${testname} ${MACRO_DIR}/dimuon_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\" \"\" kTRUE)
+ Set_Tests_Properties(${testname} PROPERTIES
+ TIMEOUT "600"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED dimuon_cleanup
+ FIXTURES_SETUP ${fixture_dimuon_digi}
+ )
# --- Digitisation run, event-by-event
Set(testname dimuon_digi_event_${setup})
+ Set(fixture_dimuon_reco_event fixture_dimuon_reco_event_${testname})
Add_Test(${testname} ${MACRO_DIR}/run_digi.sh \"data/${setup}_test\" ${NumEvents}
\"data/${setup}_test.event\" -1.)
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully")
- set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_dimuon_digi})
- Set(fixture_dimuon_reco_event fixture_dimuon_reco_event_${testname})
- set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_dimuon_reco_event})
+ Set_Tests_Properties(${testname} PROPERTIES
+ TIMEOUT "300"
+ PASS_REGULAR_EXPRESSION "Macro finished successfully"
+ FIXTURES_REQUIRED ${fixture_dimuon_digi}
+ FIXTURES_SETUP ${fixture_dimuon_reco_event}
+ )
# --- Reconstruction run, event-by-event
Set(testname dimuon_reco_event_${setup})
- Add_Test(${testname} ${MACRO_DIR}/run_reco_event.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\" 1 1)
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "800")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
- set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_dimuon_reco_event})
Set(fixture_dimuon_ana fixture_dimuon_ana_${testname})
- set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_dimuon_ana})
+ Add_Test(${testname} ${MACRO_DIR}/run_reco_event.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\" 1 1)
+ Set_Tests_Properties(${testname} PROPERTIES
+ TIMEOUT "800"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED ${fixture_dimuon_reco_event}
+ FIXTURES_SETUP ${fixture_dimuon_ana}
+ )
# --- Much analysis
Set(testname dimuon_analysis_${setup})
- Add_Test(${testname} ${MACRO_DIR}/run_ana.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\" 1 \"\" -1)
- 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_dimuon_ana})
Set(fixture_dimuon_mass fixture_dimuon_mass_${testname})
- set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_dimuon_mass})
+ Add_Test(${testname} ${MACRO_DIR}/run_ana.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\" 1 \"\" -1)
+ Set_Tests_Properties(${testname} PROPERTIES
+ TIMEOUT "300"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED ${fixture_dimuon_ana}
+ FIXTURES_SETUP ${fixture_dimuon_mass}
+ )
# --- Invariant Mass Spectrum
Set(testname dimuon_inv_mass_${setup})
Add_Test(${testname} ${MACRO_DIR}/invM.sh \"data/${setup}_test\")
- Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "100")
- Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
- set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_dimuon_mass})
+ Set_Tests_Properties(${testname} PROPERTIES
+ TIMEOUT "100"
+ PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+ FIXTURES_REQUIRED ${fixture_dimuon_mass}
+ )
EndForEach(setup IN LISTS cbm_setup)
# end of test CBM setups from geometry/setup
diff --git a/macro/dimuon/dimuon_transport.C b/macro/dimuon/dimuon_transport.C
index 9939bcf17b..dcc342354c 100644
--- a/macro/dimuon/dimuon_transport.C
+++ b/macro/dimuon/dimuon_transport.C
@@ -40,7 +40,7 @@
//---------------------------------------------------
void dimuon_transport(Int_t nEvents = 1000, const char* setupName = "sis100_muon_lmvm", const char* output = "test",
- const char* inputFile = "")
+ const char* inputFile = "", Bool_t overwrite = kFALSE)
{
// --- Logger settings ----------------------------------------------------
@@ -79,7 +79,7 @@ void dimuon_transport(Int_t nEvents = 1000, const char* setupName = "sis100_muon
// --- Transport run ----------------------------------------------------
CbmTransport run;
run.AddInput(inFile.Data(), kPluto);
- run.SetOutFileName(outFile);
+ run.SetOutFileName(outFile, overwrite);
run.SetParFileName(parFile);
run.SetGeoFileName(geoFile);
run.LoadSetup(setupName);
diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index fb2a727069..8207fc647d 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -52,7 +52,7 @@ ForEach(setup IN LISTS cbm_setup)
Set(testname mcbm_transport_${setup})
Set(fixture_mcbm_transport fixture_${testname})
- Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
+ Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\" \"\" kTRUE)
Set_Tests_Properties(${testname} PROPERTIES
TIMEOUT "600"
PASS_REGULAR_EXPRESSION "Test Passed;All ok"
diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index e540bf55ee..6dfa7ffc71 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -31,7 +31,7 @@ void mcbm_transport(Int_t nEvents = 10,
// const char* setupName = "mcbm_beam_2019_11",
// const char* setupName = "mcbm_beam_2019_03",
// const char* setupName = "sis18_mcbm_25deg_long",
- const char* output = "data/test", const char* inputFile = "")
+ const char* output = "data/test", const char* inputFile = "", Bool_t overwrite = kFALSE)
{
// --- Define the beam angle ----------------------------------------------
Double_t beamRotY = 25.;
@@ -172,7 +172,7 @@ void mcbm_transport(Int_t nEvents = 10,
// comment the following line to remove target interaction
run.AddInput(inFile);
- run.SetOutFileName(outFile);
+ run.SetOutFileName(outFile, overwrite);
run.SetParFileName(parFile);
run.SetGeoFileName(geoFile);
run.LoadSetup(setupName);
diff --git a/macro/much/run_transport.C b/macro/much/run_transport.C
index 36cfe6916c..4fdbbf93d7 100644
--- a/macro/much/run_transport.C
+++ b/macro/much/run_transport.C
@@ -40,7 +40,7 @@
//---------------------------------------------------
void run_transport(Int_t nEvents = 3, const char* setupName = "sis100_muon_lmvm", const char* output = "muons",
- const char* inputFile = "", const char* plutoFile = "")
+ const char* inputFile = "", const char* plutoFile = "", Bool_t overwrite = kFALSE)
{
// --- Logger settings ----------------------------------------------------
@@ -112,7 +112,7 @@ void run_transport(Int_t nEvents = 3, const char* setupName = "sis100_muon_lmvm"
// run.AddInput(new FairIonGenerator(47, 108, 108, Nion, 0., 0., bMom, 0., 0., -1.));
// run.AddInput(boxGen);
// run.AddInput(boxGen2);
- run.SetOutFileName(outFile);
+ run.SetOutFileName(outFile, overwrite);
run.SetParFileName(parFile);
run.SetGeoFileName(geoFile);
run.LoadSetup(setupName);
diff --git a/macro/reco/CMakeLists.txt b/macro/reco/CMakeLists.txt
index 88d964b80e..a64a507f80 100644
--- a/macro/reco/CMakeLists.txt
+++ b/macro/reco/CMakeLists.txt
@@ -76,7 +76,7 @@ foreach(setup IN LISTS cbm_setup)
set(input ${CBMROOT_SOURCE_DIR}/input/urqmd.auau.10gev.centr.root)
set(output ${datadir}/${sname}_coll)
add_test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_tra_file.sh
- \"${input}\" ${nEvents} \"${output}\" \"${setup}\" kGeant3 ${randomSeed})
+ \"${input}\" ${nEvents} \"${output}\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -91,7 +91,7 @@ foreach(setup IN LISTS cbm_setup)
set(input ${CBMROOT_SOURCE_DIR}/input/pluto.auau.8gev.omega.mpmm.0001.root)
set(output ${datadir}/${sname}_sign)
add_test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_tra_file.sh
- \"${input}\" ${nEvents} \"${output}\" \"${setup}\" kGeant3 ${randomSeed})
+ \"${input}\" ${nEvents} \"${output}\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -105,7 +105,7 @@ foreach(setup IN LISTS cbm_setup)
set(testname reco_tra_beam_${sname})
set(output ${datadir}/${sname}_beam)
add_test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_tra_beam.sh
- ${nBeam} \"Au\" 10 -1 \"${output}\" \"${setup}\" kGeant3 ${randomSeed})
+ ${nBeam} \"Au\" 10 -1 \"${output}\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 11b20e79fa..aa64e1b4c5 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -107,7 +107,7 @@ foreach(setup IN LISTS cbm_setup)
set(testname run_${sname}_tra_coll)
set(input ${CBMROOT_SOURCE_DIR}/input/urqmd.auau.10gev.centr.root)
add_test(${testname} ${MACRO_DIR}/run_tra_file.sh
- \"${input}\" ${nEvents} \"data/${sname}_coll\" \"${setup}\" kGeant3 ${randomSeed})
+ \"${input}\" ${nEvents} \"data/${sname}_coll\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -121,7 +121,7 @@ foreach(setup IN LISTS cbm_setup)
set(testname run_${sname}_tra_sign)
set(input ${CBMROOT_SOURCE_DIR}/input/pluto.auau.8gev.omega.mpmm.0001.root)
add_test(${testname} ${MACRO_DIR}/run_tra_file.sh
- \"${input}\" ${nEvents} \"data/${sname}_sign\" \"${setup}\" kGeant3 ${randomSeed})
+ \"${input}\" ${nEvents} \"data/${sname}_sign\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -134,7 +134,7 @@ foreach(setup IN LISTS cbm_setup)
# --- Transport run with beam events, using run_tra_beam.C
set(testname run_${sname}_tra_beam)
add_test(${testname} ${MACRO_DIR}/run_tra_beam.sh
- ${nBeam} \"Au\" 10 -1 \"data/${sname}_beam\" \"${setup}\" kGeant3 ${randomSeed})
+ ${nBeam} \"Au\" 10 -1 \"data/${sname}_beam\" \"${setup}\" kGeant3 ${randomSeed} kTRUE)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -262,29 +262,6 @@ foreach(setup IN LISTS cbm_setup)
RESOURCE_LOCK collParDb_${setup}
)
-# # --- Test run_transport_json_config
-# # --- Transport run using run_transport_json_config.C
-# set(testname run_transport_json_config)
-# add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh \"\" 2 ${randomSeed})
-# set_tests_properties(${testname} PROPERTIES
-# TIMEOUT ${timeOutTime}
-# PASS_REGULAR_EXPRESSION "Macro finished successfully"
-# FIXTURES_REQUIRED cleanup
-# FIXTURES_SETUP fixt_tra_json_config
-# RESOURCE_LOCK json_config_ParDb
-# )
-
-# # --- Test run_digi_json_config
-# # --- Digitization run with using run_digi_json_config.C
-# set(testname run_digi_json_config)
-# add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh)
-# set_tests_properties(${testname} PROPERTIES
-# TIMEOUT ${timeOutTime}
-# PASS_REGULAR_EXPRESSION "Macro finished successfully"
-# FIXTURES_REQUIRED fixt_tra_json_config
-# FIXTURES_SETUP fixt_digi_json_config
-# RESOURCE_LOCK json_config_ParDb
-# )
endforeach(setup IN LISTS cbm_setup)
diff --git a/macro/run/config_ci.json b/macro/run/config_ci.json
index 1fb5f86d9d..bac0abc9ec 100644
--- a/macro/run/config_ci.json
+++ b/macro/run/config_ci.json
@@ -17,7 +17,7 @@
],
"output": {
"path": "data/test",
- "overwrite": false
+ "overwrite": true
},
"target": {
"material": "Gold",
diff --git a/macro/run/run_tra_beam.C b/macro/run/run_tra_beam.C
index 8a474f35ea..ad354b132c 100644
--- a/macro/run/run_tra_beam.C
+++ b/macro/run/run_tra_beam.C
@@ -59,7 +59,7 @@
**/
void run_tra_beam(Int_t nEvents = 1, const char* species = "Au", Double_t beamP = 12., Double_t beamStartZ = -1.,
const char* output = "beam", const char* setup = "sis100_electron", ECbmEngine engine = kGeant3,
- int randomSeed = 0)
+ int randomSeed = 0, Bool_t overwrite = kFALSE)
{
// --- Logger settings ----------------------------------------------------
@@ -159,7 +159,7 @@ void run_tra_beam(Int_t nEvents = 1, const char* species = "Au", Double_t beamP
// --- Transport run ----------------------------------------------------
CbmTransport run;
run.SetEngine(engine);
- run.SetOutFileName(outFile);
+ run.SetOutFileName(outFile, overwrite);
run.SetParFileName(parFile);
run.SetGeoFileName(geoFile);
run.LoadSetup(setup);
diff --git a/macro/run/run_tra_file.C b/macro/run/run_tra_file.C
index f2395aba50..a963483fe1 100644
--- a/macro/run/run_tra_file.C
+++ b/macro/run/run_tra_file.C
@@ -67,7 +67,8 @@
** http://computing.gitpages.cbm.gsi.de/cbmroot/classCbmTransport.html
**/
void run_tra_file(const char* input = "", Int_t nEvents = 1, const char* output = "",
- const char* setup = "sis100_electron", ECbmEngine engine = kGeant3, int randomSeed = 0)
+ const char* setup = "sis100_electron", ECbmEngine engine = kGeant3, int randomSeed = 0,
+ Bool_t overwrite = kFALSE)
{
// --- Logger settings ----------------------------------------------------
@@ -158,7 +159,7 @@ void run_tra_file(const char* input = "", Int_t nEvents = 1, const char* output
if (inFile.Contains("pluto", TString::kIgnoreCase)) { run.AddInput(inFile, kPluto); }
else
run.AddInput(inFile, kUnigen);
- run.SetOutFileName(outFile);
+ run.SetOutFileName(outFile, overwrite);
run.SetParFileName(parFile);
run.SetGeoFileName(geoFile);
run.LoadSetup(setup);
--
GitLab