Skip to content

GitLab

Commit c237a49b authored by Pierre-Alain Loizeau's avatar Pierre-Alain Loizeau
Browse files

[COSY 2019] Fix and re-enable the cosy_process (real data reco) test

parent 3e1e5372
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 30 deletions
macro/beamtime/cosy2019/CMakeLists.txt
View file @ c237a49b
......@@ -42,7 +42,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
## Generate scripts
GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C ) # Unpackers (real)
GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/cosy2019/cosy2019_calib.C ) # Coarse time calibration (real)
# GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/cosy2019/cosy2019_process.C ) # Cluster Finding + Hit reconstruction, time based (real)
GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/cosy2019/cosy2019_process.C ) # Cluster Finding + Hit reconstruction, time based (real)
## Run only if raw data files present
ForEach(RUN 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 )
......@@ -78,15 +78,15 @@ If(DEFINED ENV{RAW_DATA_PATH} )
Set(fixture_cosy_calib_${RUN} fixture_done_${testname})
set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_cosy_calib_${RUN}})
## Clustering = broken as of 09/12/2020
# Set(testname cosy_process_2019_${RUN})
# Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/cosy2019/cosy2019_process.sh ${RUN_INDEX} )
# Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
# Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
# set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_cosy_calib_${RUN}})
# set_tests_properties(${testname} PROPERTIES DEPENDS cosy_calib_2019_${RUN})
# Set(fixture_cosy_process_${RUN} fixture_done_${testname})
# set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_cosy_process_${RUN}})
# Reco = Clustering + Hit Building
Set(testname cosy_process_2019_${RUN})
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/cosy2019/cosy2019_process.sh 20 ${RUN_INDEX} \"data/\" )
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_cosy_calib_${RUN}})
set_tests_properties(${testname} PROPERTIES DEPENDS cosy_calib_2019_${RUN})
Set(fixture_cosy_process_${RUN} fixture_done_${testname})
set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_cosy_process_${RUN}})
EndIf() # If(EXISTS ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa))
EndForEach() # ForEach(RUN 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 )
EndIf() # If(DEFINED ENV{RAW_DATA_PATH} )
......
macro/beamtime/cosy2019/cosy2019_process.C
View file @ c237a49b
......@@ -8,14 +8,12 @@
// --------------------------------------------------------------------------
void cosy2019_process()
void cosy2019_process( Int_t nTimeslices = -1, UInt_t uRunId = 25, TString outDir = "" )
{
Int_t nTimeslices = -1;
TString inFile = "unp_cosy_0025.root";
TString parFile = "unp_cosy_params_0025.root";
TString outFile = "0025.rec.root";
TString geoFile = "sts_hodo_v19a_cosy_geo.root";
// ----- Environment --------------------------------------------------
TString myName = "cosy2019_process"; // this macro's name for screen output
TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
// ------------------------------------------------------------------------
// --- Logger settings ----------------------------------------------------
......@@ -24,19 +22,12 @@ void cosy2019_process()
// ------------------------------------------------------------------------
// ----- Environment --------------------------------------------------
TString myName = "cosy2019_process"; // this macro's name for screen output
TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
// TString srcDir1 = gSystem->Getenv("SLURM_INDEX"); // ------------------------------------------------------------------------
// ----- In- and output file names ------------------------------------
//TString runId = TString::Format("%04u", uRunId);
//TString inFile = outDir + "/unp_cosy_" + runId + ".root";
//if (eventMode) inFile = dataSet + ".event.raw.root";
//TString parFile = outDir + "/unp_cosy_params_" + runId + "_sts.root";
//TString outFile = dataSet + "_" + runId + ".rec.root";
//TString geoFile = dataSet + ".geo.root"; // to be created by a simulation run
TString sRunId = TString::Format("%04u", uRunId);
TString inFile = outDir + "unp_cosy_" + sRunId + ".root";
TString parFile = outDir + "unp_cosy_params_" + sRunId + ".root";
TString outFile = outDir + sRunId + ".rec.root";
TString geoFile = srcDir + "/macro/beamtime/cosy2019/sts_hodo_v19a_cosy_geo.root";
// ------------------------------------------------------------------------
......@@ -125,7 +116,7 @@ void cosy2019_process()
recoSts->UseSensorParSet(sensorParSet);
// --- Next we define the module and ASIC parameters. The same can be used for all sensors.
CbmStsParAsic asicPar(32, 75000., 3000., 5., 800., 1000., 3.9789e-3);
CbmStsParAsic asicPar(128, 32, 75000., 3000., 5., 800., 1000., 3.9789e-3);
auto modulePar = new CbmStsParModule(2048, 128);
modulePar->SetAllAsics(asicPar);
recoSts->UseModulePar(modulePar);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment