Skip to content
Snippets Groups Projects
Commit 96aeb56f authored by Dominik Smith's avatar Dominik Smith Committed by Volker Friese
Browse files

Added TRD2D support in cbm::algo::EventBuilder and dependent classes.

parent 168bd2de
No related branches found
No related tags found
1 merge request!1178Added TRD2D support in cbm::algo::EventBuilder and dependent classes.
...@@ -53,6 +53,10 @@ namespace cbm ...@@ -53,6 +53,10 @@ namespace cbm
event.fData.fTrd.fDigis = CopyRange(ts.fData.fTrd.fDigis, tMin, tMax); event.fData.fTrd.fDigis = CopyRange(ts.fData.fTrd.fDigis, tMin, tMax);
break; break;
} }
case ECbmModuleId::kTrd2d: {
event.fData.fTrd2d.fDigis = CopyRange(ts.fData.fTrd2d.fDigis, tMin, tMax);
break;
}
case ECbmModuleId::kTof: { case ECbmModuleId::kTof: {
event.fData.fTof.fDigis = CopyRange(ts.fData.fTof.fDigis, tMin, tMax); event.fData.fTof.fDigis = CopyRange(ts.fData.fTof.fDigis, tMin, tMax);
break; break;
......
...@@ -140,13 +140,14 @@ ECbmModuleId CbmDevBuildEvents::GetDetectorId(std::string detName) ...@@ -140,13 +140,14 @@ ECbmModuleId CbmDevBuildEvents::GetDetectorId(std::string detName)
/// FIXME: Disable clang formatting for now as it corrupts all alignment /// FIXME: Disable clang formatting for now as it corrupts all alignment
/* clang-format off */ /* clang-format off */
ECbmModuleId detId = ("kT0" == detName ? ECbmModuleId::kT0 ECbmModuleId detId = ("kT0" == detName ? ECbmModuleId::kT0
: ("kSts" == detName ? ECbmModuleId::kSts : ("kSts" == detName ? ECbmModuleId::kSts
: ("kMuch" == detName ? ECbmModuleId::kMuch : ("kMuch" == detName ? ECbmModuleId::kMuch
: ("kTrd" == detName ? ECbmModuleId::kTrd : ("kTrd" == detName ? ECbmModuleId::kTrd
: ("kTof" == detName ? ECbmModuleId::kTof : ("kTrd2d" == detName ? ECbmModuleId::kTrd2d
: ("kRich" == detName ? ECbmModuleId::kRich : ("kTof" == detName ? ECbmModuleId::kTof
: ("kPsd" == detName ? ECbmModuleId::kPsd : ("kRich" == detName ? ECbmModuleId::kRich
: ECbmModuleId::kNotExist))))))); : ("kPsd" == detName ? ECbmModuleId::kPsd
: ECbmModuleId::kNotExist))))))));
return detId; return detId;
/// FIXME: Re-enable clang formatting after formatted lines /// FIXME: Re-enable clang formatting after formatted lines
/* clang-format on */ /* clang-format on */
......
...@@ -68,6 +68,13 @@ CbmDigiTimeslice CbmTaskBuildEvents::FillTimeSlice() ...@@ -68,6 +68,13 @@ CbmDigiTimeslice CbmTaskBuildEvents::FillTimeSlice()
ts.fData.fTrd.fDigis = *digiVec; ts.fData.fTrd.fDigis = *digiVec;
break; break;
} }
case ECbmModuleId::kTrd2d: {
const vector<CbmTrdDigi>* digiVec =
boost::any_cast<const vector<CbmTrdDigi>*>(digiBranch->GetBranchContainer());
assert(digiVec);
ts.fData.fTrd2d.fDigis = *digiVec;
break;
}
case ECbmModuleId::kTof: { case ECbmModuleId::kTof: {
const vector<CbmTofDigi>* digiVec = const vector<CbmTofDigi>* digiVec =
boost::any_cast<const vector<CbmTofDigi>*>(digiBranch->GetBranchContainer()); boost::any_cast<const vector<CbmTofDigi>*>(digiBranch->GetBranchContainer());
...@@ -221,6 +228,7 @@ size_t CbmTaskBuildEvents::GetNumDigis(const CbmDigiData& data, ECbmModuleId sys ...@@ -221,6 +228,7 @@ size_t CbmTaskBuildEvents::GetNumDigis(const CbmDigiData& data, ECbmModuleId sys
case ECbmModuleId::kRich: result = data.fRich.fDigis.size(); break; case ECbmModuleId::kRich: result = data.fRich.fDigis.size(); break;
case ECbmModuleId::kMuch: result = data.fMuch.fDigis.size(); break; case ECbmModuleId::kMuch: result = data.fMuch.fDigis.size(); break;
case ECbmModuleId::kTrd: result = data.fTrd.fDigis.size(); break; case ECbmModuleId::kTrd: result = data.fTrd.fDigis.size(); break;
case ECbmModuleId::kTrd2d: result = data.fTrd2d.fDigis.size(); break;
case ECbmModuleId::kTof: result = data.fTof.fDigis.size(); break; case ECbmModuleId::kTof: result = data.fTof.fDigis.size(); break;
case ECbmModuleId::kPsd: result = data.fPsd.fDigis.size(); break; case ECbmModuleId::kPsd: result = data.fPsd.fDigis.size(); break;
case ECbmModuleId::kT0: result = data.fT0.fDigis.size(); break; case ECbmModuleId::kT0: result = data.fT0.fDigis.size(); break;
......
...@@ -120,7 +120,7 @@ private: // members ...@@ -120,7 +120,7 @@ private: // members
double fTimeSelectorEvt = 0.; double fTimeSelectorEvt = 0.;
double fTimeTot = 0.; double fTimeTot = 0.;
ClassDef(CbmTaskBuildEvents, 1); ClassDef(CbmTaskBuildEvents, 2);
}; };
#endif /* CBMTASKBUILDEVENTS_H */ #endif /* CBMTASKBUILDEVENTS_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment