From 57bca1bdb16519b6a452433a5e17e1bfafbf1e34 Mon Sep 17 00:00:00 2001
From: "P.-A. Loizeau" <p.-a.loizeau@gsi.de>
Date: Fri, 13 May 2022 11:50:13 +0200
Subject: [PATCH] [Evt Builder] Fix string comp in filling of separate histos
for TRD 1D and 2D
---
.../eventbuilder/digis/CbmAlgoBuildRawEvents.cxx | 16 ++++++++--------
reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h | 15 +++++----------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index 291a7f0ffb..d6460d99ab 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -1217,11 +1217,11 @@ void CbmAlgoBuildRawEvents::FillHistos()
if (nullptr == pDigi) continue;
dTimeDiff = pDigi->GetTime() - evt->GetStartTime();
if (pDigi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kSPADIC) {
- if (fvDets[uDetIdx].sName == "kTrd2D") continue;
+ if (fvDets[uDetIdx].sName == "Trd2D") continue;
++uNbDataTrd1d;
}
else if (pDigi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kFASP) {
- if (fvDets[uDetIdx].sName == "kTrd") continue;
+ if (fvDets[uDetIdx].sName == "Trd1D") continue;
++uNbDataTrd2d;
}
break;
@@ -1331,11 +1331,11 @@ void CbmAlgoBuildRawEvents::FillHistos()
if (nullptr == pDigi) continue;
dTimeDiff = pDigi->GetTime() - evt->GetStartTime();
if (pDigi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kSPADIC) {
- if (fRefDet.sName == "kTrd2D") continue;
+ if (fRefDet.sName == "Trd2D") continue;
++uNbDataTrd1d;
}
else if (pDigi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kFASP) {
- if (fRefDet.sName == "kTrd") continue;
+ if (fRefDet.sName == "Trd1D") continue;
++uNbDataTrd2d;
}
break;
@@ -1381,11 +1381,11 @@ void CbmAlgoBuildRawEvents::FillHistos()
fvhNbDigiPerEvtDet[uDetIdx]->Fill(uNbDataTof);
fvhNbDigiPerEvtTimeDet[uDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTof);
}
- else if (fvDets[uDetIdx].sName == "kTrd") {
+ else if (fvDets[uDetIdx].sName == "Trd1D") {
fvhNbDigiPerEvtDet[uDetIdx]->Fill(uNbDataTrd1d);
fvhNbDigiPerEvtTimeDet[uDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTrd1d);
}
- else if (fvDets[uDetIdx].sName == "kTrd2D") {
+ else if (fvDets[uDetIdx].sName == "Trd2D") {
fvhNbDigiPerEvtDet[uDetIdx]->Fill(uNbDataTrd2d);
fvhNbDigiPerEvtTimeDet[uDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTrd2d);
}
@@ -1406,11 +1406,11 @@ void CbmAlgoBuildRawEvents::FillHistos()
fvhNbDigiPerEvtDet[uRefDetIdx]->Fill(uNbDataTof);
fvhNbDigiPerEvtTimeDet[uRefDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTof);
}
- else if (fRefDet.sName == "kTrd") {
+ else if (fRefDet.sName == "Trd1D") {
fvhNbDigiPerEvtDet[uRefDetIdx]->Fill(uNbDataTrd1d);
fvhNbDigiPerEvtTimeDet[uRefDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTrd1d);
}
- else if (fRefDet.sName == "kTrd2D") {
+ else if (fRefDet.sName == "Trd2D") {
fvhNbDigiPerEvtDet[uRefDetIdx]->Fill(uNbDataTrd2d);
fvhNbDigiPerEvtTimeDet[uRefDetIdx]->Fill(evt->GetStartTime() * 1e-9, uNbDataTrd2d);
}
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
index 546786cde5..a0c3d56614 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
@@ -97,9 +97,9 @@ static const RawEventBuilderDetector kRawEventBuilderDetSts =
static const RawEventBuilderDetector kRawEventBuilderDetMuch =
RawEventBuilderDetector(ECbmModuleId::kMuch, ECbmDataType::kMuchDigi, "Much");
static const RawEventBuilderDetector kRawEventBuilderDetTrd =
- RawEventBuilderDetector(ECbmModuleId::kTrd, ECbmDataType::kTrdDigi, "Trd");
+ RawEventBuilderDetector(ECbmModuleId::kTrd, ECbmDataType::kTrdDigi, "Trd1D");
static const RawEventBuilderDetector kRawEventBuilderDetTrd2D =
- RawEventBuilderDetector(ECbmModuleId::kTrd2d, ECbmDataType::kTrdDigi, "kTrd2D");
+ RawEventBuilderDetector(ECbmModuleId::kTrd2d, ECbmDataType::kTrdDigi, "Trd2D");
static const RawEventBuilderDetector kRawEventBuilderDetTof =
RawEventBuilderDetector(ECbmModuleId::kTof, ECbmDataType::kTofDigi, "Tof");
static const RawEventBuilderDetector kRawEventBuilderDetRich =
@@ -268,15 +268,10 @@ private:
TStopwatch* fTimer = nullptr; //! is create when fbGetTimings is set before init
- RawEventBuilderDetector fRefDet = RawEventBuilderDetector(ECbmModuleId::kT0, ECbmDataType::kT0Digi, "T0");
+ RawEventBuilderDetector fRefDet = kRawEventBuilderDetT0;
std::vector<RawEventBuilderDetector> fvDets = {
- RawEventBuilderDetector(ECbmModuleId::kSts, ECbmDataType::kStsDigi, "kSts"),
- RawEventBuilderDetector(ECbmModuleId::kMuch, ECbmDataType::kMuchDigi, "kMuch"),
- RawEventBuilderDetector(ECbmModuleId::kTrd, ECbmDataType::kTrdDigi, "kTrd"),
- RawEventBuilderDetector(ECbmModuleId::kTrd2d, ECbmDataType::kTrdDigi, "kTrd2D"),
- RawEventBuilderDetector(ECbmModuleId::kTof, ECbmDataType::kTofDigi, "kTof"),
- RawEventBuilderDetector(ECbmModuleId::kRich, ECbmDataType::kRichDigi, "kRich"),
- RawEventBuilderDetector(ECbmModuleId::kPsd, ECbmDataType::kPsdDigi, "kPsd")};
+ kRawEventBuilderDetSts, kRawEventBuilderDetMuch, kRawEventBuilderDetTrd, kRawEventBuilderDetTrd2D,
+ kRawEventBuilderDetTof, kRawEventBuilderDetRich, kRawEventBuilderDetPsd};
Double_t fdEarliestTimeWinBeg = kdDefaultTimeWinBeg;
Double_t fdLatestTimeWinEnd = kdDefaultTimeWinEnd;
--
GitLab