diff --git a/macro/alignment/run_BbaAlignment_mcbm.C b/macro/alignment/run_BbaAlignment_mcbm.C index dedcce7ae56e3f905a3be5ca02cebb8fcf7a13e0..2607632273dc23161bd4951f88b6083787329587 100644 --- a/macro/alignment/run_BbaAlignment_mcbm.C +++ b/macro/alignment/run_BbaAlignment_mcbm.C @@ -130,7 +130,7 @@ void run_BbaAlignment_mcbm(Int_t nEvents = -1, TString dataset = "data/mcbm_beam // TODO: read tracking parameters from the file like CaOutputQa does //TODO: instead of initializing the tracker //TString caParFile = recFile; - //caParFile.ReplaceAll(".root", ".L1Parameters.dat"); + //caParFile.ReplaceAll(".root", ".ca.par"); //auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC); //pCaOutputQa->ReadParameters(caParFile.Data()); diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C index a971627d91618213675ee1c3a03c63f792f05725..d914202eb461efb4b9e078f924589d0c51bafd12 100644 --- a/macro/mcbm/mcbm_qa.C +++ b/macro/mcbm/mcbm_qa.C @@ -288,7 +288,7 @@ void mcbm_qa(Int_t nEvents = 0, // Tracking parameters file is required TString caParFile = recFile; - caParFile.ReplaceAll(".root", ".L1Parameters.dat"); + caParFile.ReplaceAll(".root", ".ca.par"); auto* pCaInputQaSetup = new cbm::ca::InputQaSetup(verbose, bUseMC); pCaInputQaSetup->SetDetectorFlag(cbm::algo::ca::EDetectorID::kSts, bUseSts); diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C index 015689c452bfd68f210a477941f043521c484e57..48fb1aa0395bb325abf04c746fd69e06c8a74f49 100644 --- a/macro/mcbm/mcbm_reco_event.C +++ b/macro/mcbm/mcbm_reco_event.C @@ -386,6 +386,7 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test", // User configuration example for CA: //l1->SetConfigUser(srcDir + "/macro/L1/configs/ca_params_user_example.yaml"); + l1->SetConfigUser("/u/szharko/frameworks/cbm/work/data_runner/mcbm2024/ca_mcbm2024_test_main.yaml"); run->AddTask(l1); CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder(); diff --git a/macro/qa/run_recoQa.C b/macro/qa/run_recoQa.C index 709753cc8116fe89800d1c260032f13de2b36f09..5243739d3705bbe9d4b9de6cdc754133997ef31d 100644 --- a/macro/qa/run_recoQa.C +++ b/macro/qa/run_recoQa.C @@ -128,7 +128,7 @@ void run_recoQa(Int_t nEvents = -1, TString dataset = "2391_node8_0_0000", // TODO: read tracking parameters from the file like CaOutputQa does //TODO: instead of initializing the tracker //TString caParFile = recFile; - //caParFile.ReplaceAll(".root", ".L1Parameters.dat"); + //caParFile.ReplaceAll(".root", ".ca.par"); //auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC); //pCaOutputQa->ReadParameters(caParFile.Data()); diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C index 2f85dd770057b367745da4d32d42d532d79d9321..d1d613abf2b3d091c0f92015b1c87cc378fec414 100644 --- a/macro/run/run_qa.C +++ b/macro/run/run_qa.C @@ -301,7 +301,7 @@ void run_qa(TString dataTraColl, qaManager->AddTask(new CbmKF()); // TODO: Needed? TString caParFile = recFile; - caParFile.ReplaceAll(".root", ".L1Parameters.dat"); + caParFile.ReplaceAll(".root", ".ca.par"); auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC); pCaOutputQa->SetProcessFullTs(!bEventBasedReco); diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h index 67a7be9285ae675afb3c5919be1d0b91afdd1415..f488fddca823fc7a9f315f1f3f6ccbcdf618f780 100644 --- a/reco/L1/CbmL1.h +++ b/reco/L1/CbmL1.h @@ -370,7 +370,7 @@ class CbmL1 : public FairTask { /// /path/to/[pref].reco.root, the data files will be: /// [dir]/input_hits/[pref].job[No].ca.input.dat - hits input files, containing serialized ca::InputData objects, /// stored for each job (each call of CbmL1::ReadEvent function) - /// [dir]/[pref].L1Parameters.dat - parameters input files, containing serialized L1Parameters object + /// [dir]/[pref].ca.par - parameters input files, containing serialized L1Parameters object void DefineSTAPNames(const char* dirName); /// Writes initialized L1Parameters object to file "" @@ -460,7 +460,7 @@ class CbmL1 : public FairTask { TString fSTAPDataPrefix = "test"; ///< Name of input/output file prefix. The prefix is defined by output TTree file /// Extension for IO of the L1Parameters object - static constexpr std::string_view kSTAPParamSuffix = "L1Parameters.dat"; + static constexpr std::string_view kSTAPParamSuffix = "ca.par"; /// Extension for IO of the ca::InputData object /// \note IO of the ca::InputData object is called inside every launch of CbmL1::ReadEvent function. Inside the function