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

[mCBM 2020] Fix mcbm Ana test after rebasing

parent ec5c26d2
...@@ -26,7 +26,7 @@ CbmTofDetectorId_v21a::CbmTofDetectorId_v21a() ...@@ -26,7 +26,7 @@ CbmTofDetectorId_v21a::CbmTofDetectorId_v21a()
if (i == 4) continue; // ignore side bit if (i == 4) continue; // ignore side bit
modulemask |= (maskarray[i] << shiftarray[i]); modulemask |= (maskarray[i] << shiftarray[i]);
} }
char prev = std::cout.fill('x'); char prev = std::cout.fill();
std::cout << "<I> V21a module mask 0x" << std::setfill('0') << std::setw(8) std::cout << "<I> V21a module mask 0x" << std::setfill('0') << std::setw(8)
<< std::right << std::hex << modulemask << std::setfill(prev) << std::right << std::hex << modulemask << std::setfill(prev)
<< std::dec << std::endl; << std::dec << std::endl;
......
...@@ -146,8 +146,8 @@ If(DEFINED ENV{RAW_DATA_PATH} ) ...@@ -146,8 +146,8 @@ If(DEFINED ENV{RAW_DATA_PATH} )
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} 1000 "kTRUE" ) Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} 1000 "kTRUE" )
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600") Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok") Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_build_reco_${RUN}}) set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_track_evt_win_${RUN}})
set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_build_reco_2020_${RUN}) set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_track_evt_win_2020_${RUN})
Set(fixture_mcbm_evt_win_ana_${RUN} fixture_done_${testname}) Set(fixture_mcbm_evt_win_ana_${RUN} fixture_done_${testname})
set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_evt_win_ana_${RUN}}) set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_evt_win_ana_${RUN}})
...@@ -155,8 +155,8 @@ If(DEFINED ENV{RAW_DATA_PATH} ) ...@@ -155,8 +155,8 @@ If(DEFINED ENV{RAW_DATA_PATH} )
Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} ) Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} )
Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600") Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok") Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_event_reco_${RUN}}) set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_track_event_${RUN}})
set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_event_reco_2020_${RUN}) set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_track_event_2020_${RUN})
Set(fixture_mcbm_event_ana_${RUN} fixture_done_${testname}) Set(fixture_mcbm_event_ana_${RUN} fixture_done_${testname})
set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_event_ana_${RUN}}) set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_event_ana_${RUN}})
......
...@@ -23,9 +23,11 @@ void mcbm_event_ana(Int_t runId = 831, ...@@ -23,9 +23,11 @@ void mcbm_event_ana(Int_t runId = 831,
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// ----- In- and output file names ------------------------------------ // ----- In- and output file names ------------------------------------
TString inFile = Form("./data/reco_mcbm_%03u.root", runId); TString inFile = Form("./data/reco_mcbm_event_%03u.root", runId);
TString trkFile = Form("./data/tracking_mcbm_event_%03u.root", runId);
if (bUseEvtWin) { if (bUseEvtWin) {
inFile = Form("./data/reco_mcbm_evt_win_%03u.root", runId); inFile = Form("./data/reco_mcbm_evt_win_%03u.root", runId);
trkFile = Form("./data/tracking_mcbm_evt_win_%03u.root", runId);
} // if (bUseEvtWin) } // if (bUseEvtWin)
TString parFile = Form("./data/unp_mcbm_params_%i.root", runId); TString parFile = Form("./data/unp_mcbm_params_%i.root", runId);
TString geoFile = paramDir + "mcbm_beam_2020_03.geo.root"; TString geoFile = paramDir + "mcbm_beam_2020_03.geo.root";
...@@ -47,6 +49,7 @@ void mcbm_event_ana(Int_t runId = 831, ...@@ -47,6 +49,7 @@ void mcbm_event_ana(Int_t runId = 831,
// ----- FairRunAna --------------------------------------------------- // ----- FairRunAna ---------------------------------------------------
FairRunAna* run = new FairRunAna(); FairRunAna* run = new FairRunAna();
FairFileSource* inputSource = new FairFileSource(inFile); FairFileSource* inputSource = new FairFileSource(inFile);
inputSource->AddFriend(trkFile);
run->SetSource(inputSource); run->SetSource(inputSource);
FairRootFileSink* outputSink = new FairRootFileSink(outFile); FairRootFileSink* outputSink = new FairRootFileSink(outFile);
......
Supports Markdown
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