From b7f8473db371991b5c570ab03aee005fce4c5b81 Mon Sep 17 00:00:00 2001
From: Valentina <v.akishina@gsi.de>
Date: Wed, 21 Apr 2021 03:22:17 +0200
Subject: [PATCH] code format
---
macro/mcbm/mcbm_reco_event.C | 115 ++++++++++++++++++-----------------
reco/L1/CbmL1.cxx | 18 +++---
reco/L1/CbmL1ReadEvent.cxx | 60 +++++++++---------
3 files changed, 96 insertions(+), 97 deletions(-)
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 69e233ce10..9886d21587 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -355,70 +355,73 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test", const ch
// ------------------------------------------------------------------------
// -------- L1 CA Track Finder ---------------------------------------
- CbmKF* kalman = new CbmKF();
- run->AddTask(kalman);
- CbmL1* l1 = new CbmL1();
+ if (setupName == "mcbm_beam_2020_03") {
+
+ CbmKF* kalman = new CbmKF();
+ run->AddTask(kalman);
+ CbmL1* l1 = new CbmL1();
+
+ l1->SetmCBMmode(1);
+ l1->SetUseHitErrors(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());
+ }
- l1->SetmCBMmode(1);
- l1->SetUseHitErrors(1);
+ TString muchGeoTag;
+ if (setup->GetGeoTag(ECbmModuleId::kMuch, muchGeoTag)) {
- // --- 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());
- }
+ // --- Parameter file name
+ TString geoTag;
+ setup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
+ Int_t muchFlag = 0;
+ if (geoTag.Contains("mcbm")) muchFlag = 1;
- 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 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_v20a_mcbm.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_v20a_mcbm.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_v20a_mcbm.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_v20a_mcbm.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_v20f_mcbm.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_v20f_mcbm.root";
+ std::cout << "Using material budget file " << parFile << std::endl;
+ l1->SetTofMaterialBudgetFileName(parFile.Data());
+ }
- run->AddTask(l1);
+ run->AddTask(l1);
- CbmStsTrackFinder* stsTrackFinder = new CbmL1StsTrackFinder();
- FairTask* stsFindTracks = new CbmStsFindTracksEvents(stsTrackFinder);
- run->AddTask(stsFindTracks);
+ // CbmStsTrackFinder* stsTrackFinder = new CbmL1StsTrackFinder();
+ // FairTask* stsFindTracks = new CbmStsFindTracksEvents(stsTrackFinder);
+ // run->AddTask(stsFindTracks);
+ }
// ----- Parameter database --------------------------------------------
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index da21d553b2..6c94a69d0d 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -625,7 +625,7 @@ InitStatus CbmL1::Init()
}
}
- if (fUseTOF) NTOFStation = 3;//fTofDigiBdfPar->GetNbTrackingStations();
+ if (fUseTOF) NTOFStation = 3; //fTofDigiBdfPar->GetNbTrackingStations();
for (int i = 0; i < (maxTofStation + 1); i++)
Z_pos[i] = Z_pos[i] / NHits[i];
@@ -835,9 +835,9 @@ InitStatus CbmL1::Init()
geo.push_back(4);
- if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 0)) geo.push_back(247);
- if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 1)) geo.push_back(264);
- if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 2)) geo.push_back(280);
+ if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 0)) geo.push_back(247);
+ if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 1)) geo.push_back(264);
+ if (ist == (NMvdStations + NStsStations + NTrdStations + NMuchStations + 2)) geo.push_back(280);
geo.push_back(10); /// TODO: add Tof width dz
geo.push_back(0);
@@ -949,7 +949,7 @@ InitStatus CbmL1::Init()
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* rlFile = new TFile(fMvdMatBudgetFileName);
+ TFile* rlFile = new TFile(fMvdMatBudgetFileName);
cout << "MVD Material budget file is " << fMvdMatBudgetFileName << ".\n";
for (int j = 0, iSta = 0; iSta < algo->NMvdStations; iSta++, j++) {
TString stationNameMvd = stationName;
@@ -1002,7 +1002,7 @@ InitStatus CbmL1::Init()
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* rlFile = new TFile(fStsMatBudgetFileName);
+ TFile* rlFile = new TFile(fStsMatBudgetFileName);
cout << "STS Material budget file is " << fStsMatBudgetFileName << ".\n";
for (int j = 1, iSta = algo->NMvdStations; iSta < (algo->NMvdStations + NStsStations); iSta++, j++) {
TString stationNameSts = stationName;
@@ -1049,7 +1049,7 @@ InitStatus CbmL1::Init()
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* rlFile = new TFile(fMuchMatBudgetFileName);
+ TFile* rlFile = new TFile(fMuchMatBudgetFileName);
cout << "Much Material budget file is " << fMuchMatBudgetFileName << ".\n";
for (int j = 1, iSta = (NStsStations + NMvdStations); iSta < (NStsStations + NMvdStations + NMuchStations);
iSta++, j++) {
@@ -1108,7 +1108,7 @@ InitStatus CbmL1::Init()
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* rlFile = new TFile(fTrdMatBudgetFileName);
+ TFile* rlFile = new TFile(fTrdMatBudgetFileName);
cout << "TRD Material budget file is " << fTrdMatBudgetFileName << ".\n";
for (int j = 1, iSta = (NStsStations + NMvdStations + NMuchStations);
iSta < (NStsStations + NMvdStations + NMuchStations + NTrdStations); iSta++, j++) {
@@ -1168,7 +1168,7 @@ InitStatus CbmL1::Init()
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* rlFile = new TFile(fTofMatBudgetFileName);
+ TFile* rlFile = new TFile(fTofMatBudgetFileName);
cout << "TOF Material budget file is " << fTofMatBudgetFileName << ".\n";
for (int j = 1, iSta = (NStsStations + NMvdStations + NMuchStations + NTrdStations);
iSta < (NStsStations + NMvdStations + NMuchStations + NTrdStations + NTOFStation); iSta++, j++) {
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index 8ee4c014f6..8d61803401 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -259,12 +259,12 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
if (fTofPoints) {
for (int j = 0; j < fTofHits->GetEntriesFast(); j++) {
-
- CbmLink* link = 0;
+
+ CbmLink* link = 0;
CbmTofHit* mh = L1_DYNAMIC_CAST<CbmTofHit*>(fTofHits->At(j));
-
- if( 0x00202806 == mh->GetAddress() || 0x00002806 == mh->GetAddress() ) {
+
+ if (0x00202806 == mh->GetAddress() || 0x00002806 == mh->GetAddress()) {
ToFPointsMatch.push_back(link);
continue;
}
@@ -273,8 +273,8 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
if (matchHitMatch->GetNofLinks() > 0) {
- link = (CbmLink*) &matchHitMatch->GetLink(0);
-
+ link = (CbmLink*) &matchHitMatch->GetLink(0);
+
CbmTofPoint* pt = (CbmTofPoint*) fTofPoints->Get(link->GetFile(), link->GetEntry(), link->GetIndex());
for (int iLink = 1; iLink < matchHitMatch->GetNofLinks(); iLink++) {
@@ -306,8 +306,8 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
CbmL1MCPoint MC;
MC.event = iEvent;
-
- if (ToFPointsMatch[iMC]==0) continue;
+
+ if (ToFPointsMatch[iMC] == 0) continue;
int eventNr = ToFPointsMatch[iMC]->GetEntry();
@@ -473,7 +473,6 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
if (fVerbose >= 10) cout << "ReadEvent: mvd hits are gotten." << endl;
-
Int_t nEntSts = 0;
if (listStsHits) {
@@ -601,7 +600,6 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
} // for j
} // if listStsHits
-
if (fMuchPixelHits) {
@@ -618,7 +616,7 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
th.ExtIndex = j;
th.Det = 2;
- th.id = j + nMvdHits + nStsHits;
+ th.id = j + nMvdHits + nStsHits;
Int_t stationNumber = CbmMuchGeoScheme::GetStationIndex(mh->GetAddress());
@@ -722,7 +720,7 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
CbmTrdHit* mh = L1_DYNAMIC_CAST<CbmTrdHit*>(listTrdHits->At(j));
th.ExtIndex = j;
th.Det = 3;
-
+
th.id = j + nMvdHits + nStsHits + nMuchHits;
th.iStation = NMvdStations + mh->GetPlaneId() + NStsStations + NMuchStations;
@@ -813,24 +811,23 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
TmpHit th;
CbmTofHit* mh = L1_DYNAMIC_CAST<CbmTofHit*>(fTofHits->At(j));
-
-
-
- th.ExtIndex = j;
- th.Det = 4;
-
+
+
+ th.ExtIndex = j;
+ th.Det = 4;
+
th.id = j + nMvdHits + nStsHits + nMuchHits + nTrdHits;
-
- if( 0x00202806 == mh->GetAddress() || 0x00002806 == mh->GetAddress() ) continue;
-
+
+ if (0x00202806 == mh->GetAddress() || 0x00002806 == mh->GetAddress()) continue;
+
int sttof = -1;
-
- if (fTofDigiBdfPar->GetTrackingStation(mh)==0) sttof = 0;
- if (fTofDigiBdfPar->GetTrackingStation(mh)==1) sttof = 0;
- if (fTofDigiBdfPar->GetTrackingStation(mh)==2) sttof = 1;
- if (fTofDigiBdfPar->GetTrackingStation(mh)==3) sttof = 1;
- if (fTofDigiBdfPar->GetTrackingStation(mh)==4) sttof = 2;
- if (fTofDigiBdfPar->GetTrackingStation(mh)==5) sttof = 2;
+
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 0) sttof = 0;
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 1) sttof = 0;
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 2) sttof = 1;
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 3) sttof = 1;
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 4) sttof = 2;
+ if (fTofDigiBdfPar->GetTrackingStation(mh) == 5) sttof = 2;
th.iStation = sttof + NMvdStations + NStsStations + NMuchStations + NTrdStations;
@@ -869,7 +866,7 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
if (fPerformance) {
- if (ToFPointsMatch[j]==0) continue;
+ if (ToFPointsMatch[j] == 0) continue;
// th.iMC = j+nMvdPoints+nStsPoints+nTrdPoints+nMuchPoints;
@@ -906,8 +903,7 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
} // if listTofHits
if (fVerbose >= 10) cout << "ReadEvent: sts hits are gotten." << endl;
-
-
+
// sort hits
int nHits = nMvdHits + nStsHits + nMuchHits + nTrdHits + nTofHits;
@@ -1069,7 +1065,7 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength,
if (fData_->StsHitsStartIndex[i] == static_cast<THitI>(-1))
fData_->StsHitsStartIndex[i] = fData_->StsHitsStopIndex[i];
}
-
+
if (fVerbose >= 10) cout << "ReadEvent: mvd and sts are saved." << endl;
--
GitLab