From f9d4693893107c6030fff6823b51d9611def47d4 Mon Sep 17 00:00:00 2001
From: Dominik Smith <d.smith@gsi.de>
Date: Tue, 15 Nov 2022 13:50:21 +0100
Subject: [PATCH] Updated CbmTaskBuildEvents, CbmTaskMakeRecoEvents and
_GTestEventBuilder to support CbmTzdDigi.
---
algo/test/_GTestEventBuilder.cxx | 2 +-
reco/tasks/CbmTaskBuildEvents.cxx | 4 ++--
reco/tasks/CbmTaskMakeRecoEvents.cxx | 4 ++--
reco/tasks/CbmTaskMakeRecoEvents.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/algo/test/_GTestEventBuilder.cxx b/algo/test/_GTestEventBuilder.cxx
index 5a3ab80f0f..e856ac9c63 100644
--- a/algo/test/_GTestEventBuilder.cxx
+++ b/algo/test/_GTestEventBuilder.cxx
@@ -32,7 +32,7 @@ TEST(_GTestEventBuilder, CheckEventBuilderAlgorithmSimple)
//tsIn.fData.fTrd.fDigis.push_back(CbmTrdDigi(0, 1.0, 1.0, i * inputSpacing));
tsIn.fData.fRich.fDigis.push_back(CbmRichDigi(1111, i * inputSpacing, 1.0));
tsIn.fData.fPsd.fDigis.push_back(CbmPsdDigi(1111, i * inputSpacing, 1.0));
- tsIn.fData.fT0.fDigis.push_back(CbmTofDigi(1111, i * inputSpacing, 1.0));
+ tsIn.fData.fT0.fDigis.push_back(CbmTzdDigi(1111, i * inputSpacing, 1.0));
}
std::vector<double> triggerIn;
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index ddb366c3c1..1610d1a569 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -83,8 +83,8 @@ CbmDigiTimeslice CbmTaskBuildEvents::FillTimeSlice()
break;
}
case ECbmModuleId::kT0: { //T0 has Tof digis
- const vector<CbmTofDigi>* digiVec =
- boost::any_cast<const vector<CbmTofDigi>*>(digiBranch->GetBranchContainer());
+ const vector<CbmTzdDigi>* digiVec =
+ boost::any_cast<const vector<CbmTzdDigi>*>(digiBranch->GetBranchContainer());
assert(digiVec);
ts.fData.fT0.fDigis = *digiVec;
break;
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index aeadc0e6c8..9fa7784ad1 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -64,7 +64,7 @@ void CbmTaskMakeRecoEvents::Exec(Option_t*)
CbmEvent* recoEvent = new ((*fRecoEvents)[eventNr]) CbmEvent(eventNr);
// --- Copy T0 digis
- FillTree<CbmTofDigi>(digiEvent.fData.fT0.fDigis, fT0Digis, recoEvent, ECbmDataType::kT0Digi);
+ FillTree<CbmTzdDigi>(digiEvent.fData.fT0.fDigis, fT0Digis, recoEvent, ECbmDataType::kT0Digi);
// --- Copy STS digis
FillTree<CbmStsDigi>(digiEvent.fData.fSts.fDigis, fStsDigis, recoEvent, ECbmDataType::kStsDigi);
@@ -150,7 +150,7 @@ InitStatus CbmTaskMakeRecoEvents::Init()
}
// --- T0 digis
- fT0Digis = new std::vector<CbmTofDigi>;
+ fT0Digis = new std::vector<CbmTzdDigi>;
frm->RegisterAny("T0Digi", fT0Digis, kFALSE);
// --- STS digis
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.h b/reco/tasks/CbmTaskMakeRecoEvents.h
index 5b19a7dd73..9c020891f9 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.h
+++ b/reco/tasks/CbmTaskMakeRecoEvents.h
@@ -92,7 +92,7 @@ private: // methods
private: // members
const std::vector<CbmDigiEvent>* fDigiEvents = nullptr;
TClonesArray* fRecoEvents = nullptr;
- std::vector<CbmTofDigi>* fT0Digis = nullptr;
+ std::vector<CbmTzdDigi>* fT0Digis = nullptr;
std::vector<CbmStsDigi>* fStsDigis = nullptr;
std::vector<CbmRichDigi>* fRichDigis = nullptr;
std::vector<CbmMuchDigi>* fMuchDigis = nullptr;
--
GitLab