Skip to content
Snippets Groups Projects
Commit 6873c699 authored by Sergey Gorbunov's avatar Sergey Gorbunov Committed by Florian Uhlig
Browse files

L1: mark the CbmL1 interface for the material budget files as obsolete

parent 9f37185b
No related branches found
No related tags found
1 merge request!1278L1: mark the CbmL1 interface for the material budget files as obsolete
Pipeline #23667 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 37 additions and 262 deletions
    macro/L1/run_reco_L1global.C
    + 0
    − 34
    View file @ 6873c699
    ......@@ -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;
    ......
    macro/L1/run_reco_LITglobal.C
    + 0
    − 16
    View file @ 6873c699
    ......@@ -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;
    ......
    macro/alignment/run_BbaAlignment.C
    + 0
    − 17
    View file @ 6873c699
    ......@@ -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 --------------------------------------------
    ......
    macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
    + 0
    − 10
    View file @ 6873c699
    ......@@ -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
    ......
    macro/beamtime/mcbm2022/mcbm_reco.C
    + 0
    − 52
    View file @ 6873c699
    ......@@ -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
    ......
    macro/mcbm/mcbm_reco_event.C
    + 0
    − 49
    View file @ 6873c699
    ......@@ -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();
    ......
    macro/run/modules/reconstruct.C
    + 0
    − 15
    View file @ 6873c699
    ......@@ -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;
    ......
    macro/run/run_reco.C
    + 0
    − 16
    View file @ 6873c699
    ......@@ -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;
    ......
    reco/L1/CbmL1.h
    + 37
    − 33
    View file @ 6873c699
    ......@@ -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
    ......
    reco/offline/steer/TaskFactory.cxx
    + 0
    − 20
    View file @ 6873c699
    ......@@ -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
    ......
    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