From 6b6bfebb9ebfcc4edfa333ec20c2ddfad9b77ce0 Mon Sep 17 00:00:00 2001
From: Dominik Smith <d.smith@gsi.de>
Date: Thu, 10 Nov 2022 10:00:05 +0100
Subject: [PATCH] Replaced CbmBmonDigi by CbmTzdDigi in CbmAlgoBuildRawEvents
and related classes.
---
.../digis/CbmAlgoBuildRawEvents.cxx | 24 +++++++++----------
.../digis/CbmAlgoBuildRawEvents.h | 8 +++----
.../digis/CbmSeedFinderSlidingWindow.cxx | 4 ++--
.../digis/CbmTaskBuildRawEvents.h | 4 ++--
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index 09c56abeab..e93fcd43b4 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -5,7 +5,6 @@
#include "CbmAlgoBuildRawEvents.h"
/// CBM headers
-#include "CbmBmonDigi.h"
#include "CbmEvent.h"
#include "CbmMuchBeamTimeDigi.h"
#include "CbmMuchDigi.h"
@@ -14,6 +13,7 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
+#include "CbmTzdDigi.h"
#include "TimesliceMetaData.h"
@@ -131,7 +131,7 @@ void CbmAlgoBuildRawEvents::ProcessTs()
/// TODO: store start time of current event ?
// fCurrentEvent->SetStartTime( fPrevTime ); // Replace Seed time with time of first digi in event?
fCurrentEvent->SetEndTime(fdPrevEvtEndTime);
- SetBmonEventTime(fCurrentEvent);
+ SetTzdEventTime(fCurrentEvent);
fEventVector.push_back(fCurrentEvent);
fuCurEv++;
@@ -246,7 +246,7 @@ void CbmAlgoBuildRawEvents::BuildEvents()
break;
}
case ECbmModuleId::kT0: {
- LoopOnSeeds<CbmBmonDigi>();
+ LoopOnSeeds<CbmTzdDigi>();
break;
}
case ECbmModuleId::kNotExist: { //explicit seed times
@@ -348,7 +348,7 @@ void CbmAlgoBuildRawEvents::CheckSeed(Double_t dSeedTime, UInt_t uSeedDigiIdx)
/// TODO: store start time of current event ?
// fCurrentEvent->SetStartTime( fPrevTime ); // Replace Seed time with time of first digi in event?
fCurrentEvent->SetEndTime(fdPrevEvtEndTime);
- SetBmonEventTime(fCurrentEvent);
+ SetTzdEventTime(fCurrentEvent);
fEventVector.push_back(fCurrentEvent);
fuCurEv++;
@@ -463,7 +463,7 @@ const CbmPsdDigi* CbmAlgoBuildRawEvents::GetDigi(UInt_t uDigi)
return &((*fPsdDigis)[uDigi]);
}
template<>
-const CbmBmonDigi* CbmAlgoBuildRawEvents::GetDigi(UInt_t uDigi)
+const CbmTzdDigi* CbmAlgoBuildRawEvents::GetDigi(UInt_t uDigi)
{
return &((*fT0Digis)[uDigi]);
}
@@ -503,7 +503,7 @@ void CbmAlgoBuildRawEvents::SearchMatches(Double_t dSeedTime, RawEventBuilderDet
break;
}
case ECbmModuleId::kT0: {
- SearchMatches<CbmBmonDigi>(dSeedTime, detMatch);
+ SearchMatches<CbmTzdDigi>(dSeedTime, detMatch);
break;
}
default: {
@@ -611,15 +611,15 @@ Bool_t CbmAlgoBuildRawEvents::HasTrigger(CbmEvent* event)
return kTRUE;
}
-void CbmAlgoBuildRawEvents::SetBmonEventTime(CbmEvent* event)
+void CbmAlgoBuildRawEvents::SetTzdEventTime(CbmEvent* event)
{
int32_t iNbDigis = event->GetNofData(ECbmDataType::kT0Digi);
if (0 < iNbDigis) {
double eventTime = 0;
for (int idigi = 0; idigi < iNbDigis; ++idigi) {
- uint idx = event->GetIndex(ECbmDataType::kT0Digi, idigi);
- const CbmBmonDigi* pDigi = GetDigi<CbmBmonDigi>(idx);
+ uint idx = event->GetIndex(ECbmDataType::kT0Digi, idigi);
+ const CbmTzdDigi* pDigi = GetDigi<CbmTzdDigi>(idx);
if (nullptr == pDigi) continue;
eventTime += pDigi->GetTime();
}
@@ -896,7 +896,7 @@ uint64_t CbmAlgoBuildRawEvents::GetSizeFromDigisNb(ECbmModuleId detId, uint64_t
return ulNbDigis * sizeof(CbmPsdDigi);
}
case ECbmModuleId::kT0: {
- return ulNbDigis * sizeof(CbmBmonDigi);
+ return ulNbDigis * sizeof(CbmTzdDigi);
}
default: {
LOG(fatal) << "CbmAlgoBuildRawEvents::GetSizeFromDigisNb => "
@@ -1193,7 +1193,7 @@ void CbmAlgoBuildRawEvents::FillHistos()
uint idx = evt->GetIndex(fvDets[uDetIdx].dataType, idigi);
switch (fvDets[uDetIdx].dataType) {
case ECbmDataType::kT0Digi: {
- auto pDigi = GetDigi<CbmBmonDigi>(idx);
+ auto pDigi = GetDigi<CbmTzdDigi>(idx);
if (nullptr == pDigi) continue;
dTimeDiff = pDigi->GetTime() - evt->GetStartTime();
break;
@@ -1264,7 +1264,7 @@ void CbmAlgoBuildRawEvents::FillHistos()
uint idx = evt->GetIndex(fRefDet.dataType, idigi);
switch (fRefDet.dataType) {
case ECbmDataType::kT0Digi: {
- auto pDigi = GetDigi<CbmBmonDigi>(idx);
+ auto pDigi = GetDigi<CbmTzdDigi>(idx);
if (nullptr == pDigi) continue;
dTimeDiff = pDigi->GetTime() - evt->GetStartTime();
break;
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
index 41570b4d72..7791a02d9d 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
@@ -29,7 +29,7 @@ class CbmRichDigi;
class CbmStsDigi;
class CbmTofDigi;
class CbmTrdDigi;
-class CbmBmonDigi;
+class CbmTzdDigi;
class TClonesArray;
class TH1;
class TH2;
@@ -192,7 +192,7 @@ public:
std::vector<std::pair<TCanvas*, std::string>> GetCanvasVector() { return fvpAllCanvasPointers; }
/// Set digi containers
- void SetDigis(std::vector<CbmBmonDigi>* T0Digis) { fT0Digis = T0Digis; }
+ void SetDigis(std::vector<CbmTzdDigi>* T0Digis) { fT0Digis = T0Digis; }
void SetDigis(std::vector<CbmStsDigi>* StsDigis) { fStsDigis = StsDigis; }
void SetDigis(std::vector<CbmMuchDigi>* MuchDigis)
{
@@ -250,7 +250,7 @@ private:
void UpdateTimeWinBoundariesExtrema();
void UpdateWidestTimeWinRange();
- void SetBmonEventTime(CbmEvent* event);
+ void SetTzdEventTime(CbmEvent* event);
TFolder* outFolder; // oputput folder to store histograms
@@ -289,7 +289,7 @@ private:
/// Data input
TClonesArray* fTimeSliceMetaDataArray = nullptr; //!
- const std::vector<CbmBmonDigi>* fT0Digis = nullptr;
+ const std::vector<CbmTzdDigi>* fT0Digis = nullptr;
const std::vector<CbmMuchDigi>* fMuchDigis = nullptr;
const std::vector<CbmMuchBeamTimeDigi>* fMuchBeamTimeDigis = nullptr;
const std::vector<CbmStsDigi>* fStsDigis = nullptr;
diff --git a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
index 065039eacc..ed3c54917f 100644
--- a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
+++ b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
@@ -4,7 +4,6 @@
#include "CbmSeedFinderSlidingWindow.h"
-#include "CbmBmonDigi.h"
#include "CbmMCEventList.h"
#include "CbmMatch.h"
#include "CbmMuchBeamTimeDigi.h"
@@ -15,6 +14,7 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
+#include "CbmTzdDigi.h"
#include "FairRootManager.h"
#include <Logger.h>
@@ -127,7 +127,7 @@ void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<inType>* vIn, c
// << std::endl;
//}
}
-template void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<CbmBmonDigi>*, const std::vector<CbmMatch>*);
+template void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<CbmTzdDigi>*, const std::vector<CbmMatch>*);
template void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<CbmMuchBeamTimeDigi>*,
const std::vector<CbmMatch>*);
template void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<CbmMuchDigi>*, const std::vector<CbmMatch>*);
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
index 6c8c90c6da..add558dfd7 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
@@ -12,7 +12,6 @@
/// CBMROOT headers
#include "CbmAlgoBuildRawEvents.h"
-#include "CbmBmonDigi.h"
#include "CbmMuchBeamTimeDigi.h"
#include "CbmMuchDigi.h"
#include "CbmPsdDigi.h"
@@ -20,6 +19,7 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
+#include "CbmTzdDigi.h"
/// C/C++ headers
#include <array>
@@ -155,7 +155,7 @@ private:
std::vector<CbmTofDigi>* fTofDigis = nullptr;
std::vector<CbmRichDigi>* fRichDigis = nullptr;
std::vector<CbmPsdDigi>* fPsdDigis = nullptr;
- std::vector<CbmBmonDigi>* fT0Digis = nullptr;
+ std::vector<CbmTzdDigi>* fT0Digis = nullptr;
std::vector<Double_t>* fSeedTimes = nullptr;
/** Create digi vector and pass to algo **/
--
GitLab