From 6873c699350c9559b89020f274be95c8cd20d089 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Fri, 28 Jul 2023 12:33:06 +0000
Subject: [PATCH] L1: mark the CbmL1 interface for the material budget files as
obsolete
---
macro/L1/run_reco_L1global.C | 34 ---------
macro/L1/run_reco_LITglobal.C | 16 -----
macro/alignment/run_BbaAlignment.C | 17 -----
.../run_analysis_tree_maker.C | 10 ---
macro/beamtime/mcbm2022/mcbm_reco.C | 52 --------------
macro/mcbm/mcbm_reco_event.C | 49 -------------
macro/run/modules/reconstruct.C | 15 ----
macro/run/run_reco.C | 16 -----
reco/L1/CbmL1.h | 70 ++++++++++---------
reco/offline/steer/TaskFactory.cxx | 20 ------
10 files changed, 37 insertions(+), 262 deletions(-)
diff --git a/macro/L1/run_reco_L1global.C b/macro/L1/run_reco_L1global.C
index 2d2130013c..2238061944 100644
--- a/macro/L1/run_reco_L1global.C
+++ b/macro/L1/run_reco_L1global.C
@@ -373,40 +373,6 @@ void run_reco_L1global(TString input = "", Int_t nTimeSlices = -1, Int_t firstTi
l1->SetGlobalMode();
//l1->SetUseMcHit(0, 0, 0, 1, 0);
- // --- Material budget file names
- TString mvdGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
- TString trdGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kTrd, trdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/trd/trd_matbudget_" + trdGeoTag + ".root ";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetTrdMaterialBudgetFileName(parFile.Data());
- }
-
- /*
- TString tofGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";
- std::cout << "Using TOF material budget file " << parFile << std::endl;
- l1->SetTofMaterialBudgetFileName(parFile.Data());
- }
-*/
-
//l1->SetInputConfigName("");
run->AddTask(l1);
std::cout << "-I- " << myName << ": Added task " << l1->GetName() << std::endl;
diff --git a/macro/L1/run_reco_LITglobal.C b/macro/L1/run_reco_LITglobal.C
index 7647cd2cd3..500efede34 100644
--- a/macro/L1/run_reco_LITglobal.C
+++ b/macro/L1/run_reco_LITglobal.C
@@ -387,22 +387,6 @@ void run_reco_LITglobal(TString input = "", Int_t nTimeSlices = -1, Int_t firstT
auto l1 = (debugWithMC) ? new CbmL1("L1", 2, 3) : new CbmL1("L1", 0);
l1->SetInputConfigName(TString(gSystem->Getenv("VMCWORKDIR")) + "/reco/L1/L1Algo/L1ConfigExample.yaml");
- // --- Material budget file names
- TString mvdGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
run->AddTask(l1);
std::cout << "-I- " << myName << ": Added task " << l1->GetName() << std::endl;
diff --git a/macro/alignment/run_BbaAlignment.C b/macro/alignment/run_BbaAlignment.C
index 109356feab..d5305c42f1 100644
--- a/macro/alignment/run_BbaAlignment.C
+++ b/macro/alignment/run_BbaAlignment.C
@@ -146,23 +146,6 @@ void run_BbaAlignment(TString input = "", TString output = "", TString setup = "
// L1 tracking setup
auto l1 = new CbmL1("L1", 2, 3);
- // --- Material budget file names
- TString mvdGeoTag;
- if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
-
- TString stsGeoTag;
- if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
run->AddTask(l1);
// ----- BBA alignment --------------------------------------------
diff --git a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
index c20e169781..6438343530 100644
--- a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+++ b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
@@ -83,16 +83,6 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
run->AddTask(KF);
// needed for tracks extrapolation
auto* l1 = new CbmL1("CbmL1", 1, 3);
- if (setup->IsActive(ECbmModuleId::kMvd)) {
- setup->GetGeoTag(ECbmModuleId::kMvd, geoTag);
- const TString mvdMatBudgetFileName = srcDir + "/parameters/mvd/mvd_matbudget_" + geoTag + ".root";
- l1->SetMvdMaterialBudgetFileName(mvdMatBudgetFileName.Data());
- }
- if (setup->IsActive(ECbmModuleId::kSts)) {
- setup->GetGeoTag(ECbmModuleId::kSts, geoTag);
- const TString stsMatBudgetFileName = srcDir + "/parameters/sts/sts_matbudget_" + geoTag + ".root";
- l1->SetStsMaterialBudgetFileName(stsMatBudgetFileName.Data());
- }
run->AddTask(l1);
// --- TRD pid tasks
diff --git a/macro/beamtime/mcbm2022/mcbm_reco.C b/macro/beamtime/mcbm2022/mcbm_reco.C
index 2f30cb9afc..89eb5e276f 100644
--- a/macro/beamtime/mcbm2022/mcbm_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_reco.C
@@ -528,58 +528,6 @@ Bool_t mcbm_reco(UInt_t uRunId = 2391,
l1->SetMcbmMode();
// if (strcmp(geoSetupTag.data(), "mcbm_beam_2021_07_surveyed") == 0) l1->SetMissingHits(1);
- // --- Material budget file names
- TString mvdGeoTag;
- if (geoSetup->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (geoSetup->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root ";
- // parFile = parFile + "/parameters/sts/sts_matbudget_v19a.root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
- TString muchGeoTag;
- if (geoSetup->GetGeoTag(ECbmModuleId::kMuch, muchGeoTag)) {
-
- // --- Parameter file name
- TString geoTag;
- geoSetup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
- Int_t muchFlag = 0;
- if (geoTag.Contains("mcbm")) muchFlag = 1;
-
- // TString parFile2 = gSystem->Getenv("VMCWORKDIR");
- // parFile2 = parFile2 + "/parameters/much/much_matbudget_" + geoTag + ".root ";
- // std::cout << "Using material budget file " << parFile2 << std::endl;
- // l1->SetMuchMaterialBudgetFileName(parFile2.Data());
- }
-
- TString trdGeoTag;
- if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, trdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/trd/trd_matbudget_" + trdGeoTag + ".root ";
- // parFile = parFile + "/parameters/trd/trd_matbudget_v22a_mcbm.root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetTrdMaterialBudgetFileName(parFile.Data());
- }
-
- TString tofGeoTag;
- if (geoSetup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- //parFile = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";";
- //std::cout << "Using material budget file " << parFile << std::endl;
- // FIXME
- parFile = parFile + "/parameters/tof/tof_matbudget_v21d_mcbm.root";
- std::cout << "FIXME: Using material budget file tof_matbudget_v21d_mcbm as right one not in repo!!!" << std::endl;
- l1->SetTofMaterialBudgetFileName(parFile.Data());
- }
-
/// PAL, 08/02/2023: Is the following comment still valid with the current master?
// Workaround to get it running:
// 1) Change fUseGlobal in line 129 of CbmStsParSetModule.h to
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 6d80f6d61a..0a44b3c264 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -383,56 +383,7 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
// L1 tracking
auto l1 = (debugWithMC) ? new CbmL1("CA", 5, 3) : new CbmL1("CA");
l1->SetMcbmMode();
-
if (strcmp(setupName, "mcbm_beam_2021_07_surveyed") == 0) l1->SetMissingHits(1);
-
- // --- Material budget file names
- TString mvdGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/sts/sts_matbudget_v19a.root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
- TString muchGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kMuch, muchGeoTag)) {
-
- // --- Parameter file name
- TString geoTag;
- setup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
- Int_t muchFlag = 0;
- if (geoTag.Contains("mcbm")) muchFlag = 1;
-
- TString parFile2 = gSystem->Getenv("VMCWORKDIR");
- parFile2 = parFile2 + "/parameters/much/much_matbudget_" + geoTag + ".root ";
- std::cout << "Using material budget file " << parFile2 << std::endl;
- l1->SetMuchMaterialBudgetFileName(parFile2.Data());
- }
-
- TString trdGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kTrd, trdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/trd/trd_matbudget_" + trdGeoTag + ".root ";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetTrdMaterialBudgetFileName(parFile.Data());
- }
-
- TString tofGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetTofMaterialBudgetFileName(parFile.Data());
- }
-
run->AddTask(l1);
CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
diff --git a/macro/run/modules/reconstruct.C b/macro/run/modules/reconstruct.C
index 4335153b3a..334b9b000f 100644
--- a/macro/run/modules/reconstruct.C
+++ b/macro/run/modules/reconstruct.C
@@ -176,21 +176,6 @@ Bool_t reconstruct(Bool_t useMC = kFALSE, Bool_t searchPV = kTRUE)
if (useMC) l1 = new CbmL1("L1", 1, 3);
else
l1 = new CbmL1("L1", 0);
- // --- Material budget file names
- TString mvdGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (setup->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
run->AddTask(l1);
std::cout << "-I- : Added task " << l1->GetName() << std::endl;
diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C
index 9f3be86520..373050ec88 100644
--- a/macro/run/run_reco.C
+++ b/macro/run/run_reco.C
@@ -395,22 +395,6 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
// iterations. The same file should be used in ca::tools::WindowFinder class for hit search window estimation
//l1->SetInputConfigName(TString(gSystem->Getenv("VMCWORKDIR")) + "/reco/L1/L1Algo/L1ConfigExample.yaml");
- // --- Material budget file names
- TString mvdGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetMvdMaterialBudgetFileName(parFile.Data());
- }
- TString stsGeoTag;
- if (geo->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile += "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- std::cout << "Using material budget file " << parFile << std::endl;
- l1->SetStsMaterialBudgetFileName(parFile.Data());
- }
-
run->AddTask(l1);
std::cout << "-I- " << myName << ": Added task " << l1->GetName() << std::endl;
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 4a0e38c0ae..bf19109831 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -201,36 +201,6 @@ public:
/// (use it only in case of a crash at the initialisation of material maps)
void SetSafeMaterialInitialization(bool val = true) { fDoSafeMaterialInitialization = val; }
- /// Sets material budget file name for MVD
- void SetMvdMaterialBudgetFileName(const TString& fileName)
- {
- if (fileName != "") fMatBudgetFileName[L1DetectorID::kMvd] = fileName;
- }
-
- /// Sets material budget file name for STS
- void SetStsMaterialBudgetFileName(const TString& fileName)
- {
- if (fileName != "") fMatBudgetFileName[L1DetectorID::kSts] = fileName;
- }
-
- /// Sets material budget file name for MuCh
- void SetMuchMaterialBudgetFileName(const TString& fileName)
- {
- if (fileName != "") fMatBudgetFileName[L1DetectorID::kMuch] = fileName;
- }
-
- /// Sets material budget file name for TRD
- void SetTrdMaterialBudgetFileName(const TString& fileName)
- {
- if (fileName != "") fMatBudgetFileName[L1DetectorID::kTrd] = fileName;
- }
-
- /// Sets material budget file name for TOF
- void SetTofMaterialBudgetFileName(const TString& fileName)
- {
- if (fileName != "") fMatBudgetFileName[L1DetectorID::kTof] = fileName;
- }
-
/// Sets material budget binning
void SetMaterialBudgetNbins(int nBinsPerDimension) { fMatBudgetNbins = nBinsPerDimension; }
@@ -324,6 +294,43 @@ public:
static double boundedGaus(double sigma);
+ /// Obsolete setters to be removed
+
+ /// Sets material budget file name for MVD
+ void SetMvdMaterialBudgetFileName(const TString& fileName)
+ {
+ LOG(warning) << "CbmL1::SetMvdMaterialBudgetFileName() is obsolete and will be deleted soon, don't call it\n"
+ << " ! The material budget files are not used anymore !";
+ }
+
+ /// Sets material budget file name for STS
+ void SetStsMaterialBudgetFileName(const TString& fileName)
+ {
+ LOG(warning) << "CbmL1::SetStsMaterialBudgetFileName() is obsolete and will be deleted soon, don't call it\n"
+ << " ! The material budget files are not used anymore !";
+ }
+
+ /// Sets material budget file name for MuCh
+ void SetMuchMaterialBudgetFileName(const TString& fileName)
+ {
+ LOG(warning) << "CbmL1::SetMuchMaterialBudgetFileName() is obsolete and will be deleted soon, don't call it\n"
+ << " ! The material budget files are not used anymore !";
+ }
+
+ /// Sets material budget file name for TRD
+ void SetTrdMaterialBudgetFileName(const TString& fileName)
+ {
+ LOG(warning) << "CbmL1::SetTrdMaterialBudgetFileName() is obsolete and will be deleted soon, don't call it\n"
+ << " ! The material budget files are not used anymore !";
+ }
+
+ /// Sets material budget file name for TOF
+ void SetTofMaterialBudgetFileName(const TString& fileName)
+ {
+ LOG(warning) << "CbmL1::SetTofMaterialBudgetFileName() is obsolete and will be deleted soon, don't call it\n"
+ << " ! The material budget files are not used anymore !";
+ }
+
private:
struct TH1FParameters {
TString name, title;
@@ -655,9 +662,6 @@ private:
TTree* fpMcTripletsTree = nullptr; ///< Tree to save MC-triplets
std::string fsMcTripletsOutputFilename = ""; ///< Name of file to save MC-triplets tree
- std::unordered_map<L1DetectorID, TString>
- fMatBudgetFileName {}; ///< Map for material budget file names vs. detectorID
-
int fMatBudgetNbins {100}; ///< n bins in mat budget maps (fMatBudgetNbins x fMatBudgetNbins)
int fMatBudgetNrays {3}; ///< material budget n rays per dimansion in each bin
double fMatBudgetPitch {0.1}; ///< material budget minimal bin size in cm
diff --git a/reco/offline/steer/TaskFactory.cxx b/reco/offline/steer/TaskFactory.cxx
index 44fbc2b397..adae01ca78 100644
--- a/reco/offline/steer/TaskFactory.cxx
+++ b/reco/offline/steer/TaskFactory.cxx
@@ -62,26 +62,6 @@ namespace cbm::reco::offline
// --- CA Track Finder
auto ca = new CbmL1("CA Track Finder");
- if (fRun->IsDataPresent(ECbmModuleId::kMvd)) {
- TString mvdGeoTag;
- if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
- TString parFileMvd = gSystem->Getenv("VMCWORKDIR");
- parFileMvd += "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
- ca->SetMvdMaterialBudgetFileName(parFileMvd.Data());
- }
- else
- throw std::runtime_error("CA: No geo tag for MVD");
- }
- if (fRun->IsDataPresent(ECbmModuleId::kSts)) {
- TString stsGeoTag;
- if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
- TString parFileSts = gSystem->Getenv("VMCWORKDIR");
- parFileSts += "/parameters/sts/sts_matbudget_" + stsGeoTag + ".root";
- ca->SetStsMaterialBudgetFileName(parFileSts.Data());
- }
- else
- throw std::runtime_error("CA: No geo tag for STS");
- }
fRun->AddTask(ca);
// --- Track finder steering class
--
GitLab