From b606f0024e9800d15a2cb60875fc435dfb9db2bc Mon Sep 17 00:00:00 2001
From: Valentina <v.akishina@gsi.de>
Date: Thu, 25 Nov 2021 10:27:55 +0100
Subject: [PATCH] L1: mCBM tracking only with setup 2020_07_surveyed
---
external/InstallParameter.cmake | 2 +-
macro/mcbm/mcbm_reco_event.C | 117 ++++++++++++++++----------------
2 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index ce9ff99e3e..bf10576bf9 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 3152a1f1bf26858deb720b6e3510175c9e6ff9ce)
+set(PARAMETER_VERSION a5565588cf8a62fd6f510fa77a25da74985a25b5)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 7fe3ef71de..0c9428d13d 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -358,72 +358,73 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test", const ch
// ------------------------------------------------------------------------
// -------- L1 CA Track Finder ---------------------------------------
+ if (strcmp(setupName, "mcbm_beam_2021_07_surveyed") == 0) {
+ CbmKF* kalman = new CbmKF();
+ run->AddTask(kalman);
+ CbmL1* l1 = new CbmL1();
+ l1->SetLegacyEventMode(1);
+ l1->SetMcbmMode();
+ l1->SetUseHitErrors(1);
+ 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());
+ }
- CbmKF* kalman = new CbmKF();
- run->AddTask(kalman);
- CbmL1* l1 = new CbmL1();
- l1->SetLegacyEventMode(1);
- l1->SetMcbmMode();
- l1->SetUseHitErrors(1);
- 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)) {
- 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;
- // --- Parameter file name
- TString geoTag;
- setup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
- Int_t muchFlag = 0;
- if (geoTag.Contains("mcbm")) muchFlag = 1;
+ TString parFile = gSystem->Getenv("VMCWORKDIR");
+ parFile = parFile + "/parameters/much/much_" + geoTag(0, 4) + "_digi_sector.root";
+ std::cout << "L1: Using parameter file " << parFile << std::endl;
+ l1->SetMuchPar(parFile);
- TString parFile = gSystem->Getenv("VMCWORKDIR");
- parFile = parFile + "/parameters/much/much_" + geoTag(0, 4) + "_digi_sector.root";
- std::cout << "L1: Using parameter file " << parFile << std::endl;
- l1->SetMuchPar(parFile);
-
- 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 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 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());
- }
+ 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);
+ run->AddTask(l1);
- CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
- FairTask* globalFindTracks = new CbmL1GlobalFindTracksEvents(globalTrackFinder);
- run->AddTask(globalFindTracks);
+ CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
+ FairTask* globalFindTracks = new CbmL1GlobalFindTracksEvents(globalTrackFinder);
+ run->AddTask(globalFindTracks);
+ }
// ----- Parameter database --------------------------------------------
--
GitLab