From 6864e354cd0dc84b988a665f37c793febf628f61 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 26 Nov 2020 16:17:53 +0100
Subject: [PATCH] Unify name of CbmEvent array to CbmEvent to avoid name
collision
---
fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx | 2 +-
.../tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx | 2 +-
reco/KF/CbmKFParticleFinder.cxx | 4 ++--
reco/KF/CbmKFParticleFinderPID.cxx | 4 ++--
reco/KF/CbmKFParticleFinderQA.cxx | 2 +-
.../OffLineInterface/CbmL1GlobalTrackFinder.cxx | 6 +++---
reco/detectors/rich/CbmRichHitProducer.cxx | 2 +-
reco/detectors/sts/CbmRecoSts.cxx | 4 ++--
reco/detectors/sts/CbmStsFindTracksEvents.cxx | 4 ++--
reco/detectors/sts/CbmStsFindTracksQa.cxx | 2 +-
reco/detectors/trd/CbmTrdClusterFinder.cxx | 15 ++++++++-------
reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx | 6 +++---
.../eventbuilder/digis/CbmBuildEventsIdealNew.cxx | 6 +++---
reco/eventbuilder/digis/CbmBuildEventsQA.cxx | 8 ++++++--
reco/eventbuilder/digis/CbmBuildEventsSimple.cxx | 4 ++--
.../tracks/CbmBuildEventsFromTracksIdeal.cxx | 2 +-
.../tracks/CbmBuildEventsFromTracksReal.cxx | 2 +-
reco/eventbuilder/tracks/CbmEventBuilderQA.cxx | 6 ++++--
reco/global/CbmFindPrimaryVertexEvents.cxx | 6 ++++--
reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx | 2 +-
reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx | 2 +-
reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx | 6 +++---
22 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
index e0ff7f021b..d57aef935d 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
@@ -96,7 +96,7 @@ InitStatus CbmMcbm2018EventBuilder::Init() {
// Register output array (CbmEvent)
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "CbmEvent", "Cbm Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
if (!fEvents) LOG(fatal) << "Output branch was not created";
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index b3789f4581..966348364d 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -42,7 +42,7 @@ InitStatus CbmMcbm2019TimeWinEventBuilderTask::Init() {
/// Register output array (CbmEvent)
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "CbmEvent", "Cbm Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
if (!fEvents) LOG(fatal) << "Output branch was not created";
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 173f9739b4..3d8b2f0c1c 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -67,7 +67,7 @@ InitStatus CbmKFParticleFinder::Init() {
//check the mode
fTimeSliceMode = 0;
- if (ioman->CheckBranch("Event")) {
+ if (ioman->CheckBranch("CbmEvent")) {
fTimeSliceMode = 1;
LOG(info) << GetName() << ": Running in the timeslice mode.";
} else
@@ -75,7 +75,7 @@ InitStatus CbmKFParticleFinder::Init() {
// Get reconstructed events
if (fTimeSliceMode) {
- fEvents = (TClonesArray*) ioman->GetObject("Event");
+ fEvents = (TClonesArray*) ioman->GetObject("CbmEvent");
if (fEvents == 0)
Fatal("CbmKFParticleFinder::Init",
"No events available. Running in the event-by-event mode.");
diff --git a/reco/KF/CbmKFParticleFinderPID.cxx b/reco/KF/CbmKFParticleFinderPID.cxx
index b38f69de81..8924e95be1 100644
--- a/reco/KF/CbmKFParticleFinderPID.cxx
+++ b/reco/KF/CbmKFParticleFinderPID.cxx
@@ -100,7 +100,7 @@ InitStatus CbmKFParticleFinderPID::Init() {
//check the mode
fTimeSliceMode = 0;
- if (ioman->CheckBranch("Event")) {
+ if (ioman->CheckBranch("CbmEvent")) {
fTimeSliceMode = 1;
LOG(info) << GetName() << ": Running in the timeslice mode.";
} else
@@ -615,4 +615,4 @@ void CbmKFParticleFinderPID::SetRecoPID() {
}
}
-ClassImp(CbmKFParticleFinderPID);
\ No newline at end of file
+ClassImp(CbmKFParticleFinderPID);
diff --git a/reco/KF/CbmKFParticleFinderQA.cxx b/reco/KF/CbmKFParticleFinderQA.cxx
index 3abc251069..a7ca6589df 100644
--- a/reco/KF/CbmKFParticleFinderQA.cxx
+++ b/reco/KF/CbmKFParticleFinderQA.cxx
@@ -109,7 +109,7 @@ InitStatus CbmKFParticleFinderQA::Init() {
//check the mode
fTimeSliceMode = 0;
- if (ioman->CheckBranch("Event")) fTimeSliceMode = 1;
+ if (ioman->CheckBranch("CbmEvent")) fTimeSliceMode = 1;
//MC Tracks
if (fTimeSliceMode) {
diff --git a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
index 15e079b8d3..676cc8d4cb 100644
--- a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
@@ -2,8 +2,8 @@
/*
*====================================================================
*
- * CBM Level 1 Reconstruction
- *
+ * CBM Level 1 Reconstruction
+ *
* Authors: V. Akishina
*
* e-mail : v.akishina@gsi.de
@@ -74,7 +74,7 @@ InitStatus CbmL1GlobalTrackFinder::Init() {
ioman->Register("TofTrack", "Tof", fTofTracks, "TofTrack");
}
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
LOG(info) << fEvents << " fEvents ";
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index b3bf6fe3ab..f2d1a9b614 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -45,7 +45,7 @@ void CbmRichHitProducer::SetParContainers() {}
InitStatus CbmRichHitProducer::Init() {
FairRootManager* manager = FairRootManager::Instance();
- fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("Event"));
+ fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("CbmEvent"));
if (fCbmEvents == nullptr) {
LOG(info) << ": CbmEvent NOT found \n \n \n";
} else {
diff --git a/reco/detectors/sts/CbmRecoSts.cxx b/reco/detectors/sts/CbmRecoSts.cxx
index 04c68d8a9a..349da2d807 100644
--- a/reco/detectors/sts/CbmRecoSts.cxx
+++ b/reco/detectors/sts/CbmRecoSts.cxx
@@ -238,8 +238,8 @@ InitStatus CbmRecoSts::Init() {
// --- In event mode: get input array (CbmEvent)
if (fMode == kCbmRecoEvent) {
LOG(info) << GetName() << ": Using event-by-event mode";
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (!fEvents) {
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
+ if (nullptr == fEvents) {
LOG(warn) << GetName()
<< ": Event mode selected but no event array found!";
return kFATAL;
diff --git a/reco/detectors/sts/CbmStsFindTracksEvents.cxx b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
index ad8d25f632..8112844df5 100644
--- a/reco/detectors/sts/CbmStsFindTracksEvents.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
@@ -98,8 +98,8 @@ InitStatus CbmStsFindTracksEvents::Init() {
assert(ioman);
// --- Get input array (Events)
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (!fEvents) {
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
+ if (nullptr == fEvents) {
LOG(warn) << GetName() << ": No event array! Will process entire tree.";
}
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.cxx b/reco/detectors/sts/CbmStsFindTracksQa.cxx
index 9d5b42fadc..038969aeea 100644
--- a/reco/detectors/sts/CbmStsFindTracksQa.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksQa.cxx
@@ -226,7 +226,7 @@ InitStatus CbmStsFindTracksQa::Init() {
assert(fStsPoints);
// Get Event array
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
// Get StsHit array
fStsHits = (TClonesArray*) ioman->GetObject("StsHit");
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index f3aba7fdf0..2fab51c9c9 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -172,7 +172,8 @@ InitStatus CbmTrdClusterFinder::Init() {
ioman->Register(
"TrdCluster", "TRD", fClusters, IsOutputBranchPersistent("TrdCluster"));
- if (!IsTimeBased() && !ioman->GetObject("Event")) {
+ if (!IsTimeBased() &&
+ nullptr == dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"))) {
LOG(warn) << GetName()
<< ": Event mode selected but no event array found! Run in "
"time-based mode.";
@@ -212,14 +213,14 @@ InitStatus CbmTrdClusterFinder::Init() {
//_____________________________________________________________________
void CbmTrdClusterFinder::Exec(Option_t* /*option*/) {
/**
-* Digis are sorted according to the moduleAddress. A combiId is calculted based
-* on the rowId and the colId to have a neighbouring criterion for digis within
+* Digis are sorted according to the moduleAddress. A combiId is calculted based
+* on the rowId and the colId to have a neighbouring criterion for digis within
* the same pad row. The digis of each module are sorted according to this combiId.
* All sorted digis of one pad row are 'clustered' into rowCluster. For a new row
-* the rowClusters are compared to the rowClusters of the last row. If an overlap
-* is found they are marked to be parents(last row) and childrens(activ row)
-* (mergeRowCluster()). After this, the finale clusters are created. Therefor
-* walkCluster() walks along the list of marked parents and markes every visited
+* the rowClusters are compared to the rowClusters of the last row. If an overlap
+* is found they are marked to be parents(last row) and childrens(activ row)
+* (mergeRowCluster()). After this, the finale clusters are created. Therefor
+* walkCluster() walks along the list of marked parents and markes every visited
* rowCluster to avoid multiple usage of one rowCluster. drawCluster() can be used to
* get a visual output.
*/
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index 1baac96943..2b861d734b 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -206,13 +206,13 @@ InitStatus CbmBuildEventsIdeal::Init() {
}
// Register output array (CbmEvent)
- if (ioman->GetObject("Event")) {
- LOG(fatal) << GetName() << ": Branch Event already exists!";
+ if (ioman->GetObject("CbmEvent")) {
+ LOG(fatal) << GetName() << ": Branch CbmEvent already exists!";
return kFATAL;
}
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "Event", "CbmEvent", fEvents, IsOutputBranchPersistent("Event"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
if (!fEvents) {
LOG(fatal) << GetName() << ": Output branch could not be created!";
return kFATAL;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
index f3a7823eb8..73690b2e92 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
@@ -188,13 +188,13 @@ InitStatus CbmBuildEventsIdealNew::Init() {
}
// Register output array (CbmEvent)
- if (ioman->GetObject("Event")) {
- LOG(fatal) << GetName() << ": Branch Event already exists!";
+ if (ioman->GetObject("CbmEventStore")) {
+ LOG(fatal) << GetName() << ": Branch CbmEventStore already exists!";
return kFATAL;
}
/*
fEvents = new std::vector<CbmEventStore>();
- ioman->RegisterAny("Event", fEvents, kTRUE);
+ ioman->RegisterAny("CbmEventStore", fEvents, kTRUE);
if ( ! fEvents ) {
LOG(fatal) << GetName() << ": Output branch could not be created!";
return kFATAL;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
index f2e59f1f46..03158ba3ab 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
@@ -116,8 +116,12 @@ InitStatus CbmBuildEventsQA::Init() {
assert(ioman);
// --- Get input array (CbmEvent)
- fEvents = (TClonesArray*) ioman->GetObject("Event");
- assert(fEvents);
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
+ if (nullptr == fEvents) {
+ LOG(fatal) << "CbmBuildEventsQA::Init"
+ << "No CbmEvent TClonesArray found!";
+ }
+
// --- Get input array (CbmStsDigi)
fStsDigis = (TClonesArray*) ioman->GetObject("StsDigi");
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index 499c056ab9..1f1aa6c620 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -167,7 +167,7 @@ void CbmBuildEventsSimple::Exec(Option_t*) {
fSN = i + 1;
digi2 = (CbmStsDigi*) fStsDigis->At(i + 1);
fST = digi2->GetTime();
- /*
+ /*
cout << "--> ";
digi2=(CbmStsDigi*)fSlice->GetData(kSTS, n0);
cout << n0 << "(" << digi2->GetTime() << ")" << ", ";
@@ -200,7 +200,7 @@ InitStatus CbmBuildEventsSimple::Init() {
// Register output array (CbmStsDigi)
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "Event", "CbmEvent", fEvents, IsOutputBranchPersistent("Event"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
return kSUCCESS;
}
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index 06e49580c5..d89299331e 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -92,7 +92,7 @@ InitStatus CbmBuildEventsFromTracksIdeal::Init() {
// Register output array (CbmStsDigi)
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "Event", "CbmEvent", fEvents, IsOutputBranchPersistent("Event"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
return kSUCCESS;
}
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
index 4fa2cb19c8..88a3a6c0b7 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
@@ -50,7 +50,7 @@ InitStatus CbmBuildEventsFromTracksReal::Init() {
// Register output array (CbmStsDigi)
fEvents = new TClonesArray("CbmEvent", 100);
ioman->Register(
- "Event", "CbmEvent", fEvents, IsOutputBranchPersistent("Event"));
+ "CbmEvent", "Cbm_Event", fEvents, IsOutputBranchPersistent("CbmEvent"));
return kSUCCESS;
}
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx b/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
index 50daba4a43..25b34bbc50 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
@@ -277,8 +277,10 @@ InitStatus CbmEventBuilderQA::Init() {
assert(fStsHitMatch);
// --- Get input array (CbmEvent)
- fEvents = (TClonesArray*) ioman->GetObject("Event");
- assert(fEvents);
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
+ if (nullptr == fEvents) {
+ Fatal("CbmEventBuilderQA::Init", "No CbmEvent TClonesArray found!");
+ }
return kSUCCESS;
}
diff --git a/reco/global/CbmFindPrimaryVertexEvents.cxx b/reco/global/CbmFindPrimaryVertexEvents.cxx
index ad865cef1e..94fe264466 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.cxx
+++ b/reco/global/CbmFindPrimaryVertexEvents.cxx
@@ -82,8 +82,10 @@ InitStatus CbmFindPrimaryVertexEvents::Init() {
assert(ioman);
// Get event array
- fEvents = (TClonesArray*) ioman->GetObject("Event");
- assert(fEvents);
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
+ if (nullptr == fEvents) {
+ LOG(fatal) << GetName() << "No CbmEvent TClonesArray found!";
+ }
// Get CbmStsTrack array
fTracks = (TClonesArray*) ioman->GetObject("StsTrack");
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
index bd2880348d..5f7c875f54 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
@@ -127,7 +127,7 @@ void CbmLitFitQa::ReadDataBranches() {
<< "CbmMatchRecoToMC::ReadAndCreateDataBranches() NULL MCDataManager.";
fMCTracks = mcManager->InitBranch("MCTrack");
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
// fPrimVertex = (CbmVertex*) ioman->GetObject("PrimaryVertex");
// Get pointer to PrimaryVertex object from IOManager if it exists
// The old name for the object is "PrimaryVertex" the new one
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
index 7f8e7c7fa7..685a351ded 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
@@ -200,7 +200,7 @@ void CbmLitFindGlobalTracks::ReadInputBranches() {
} //? TOF in geometry
// --- Events
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
if (fEvents)
LOG(INFO) << GetName() << ": Found Event branch";
else
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
index 2ae3ba5c7f..e9760f58ae 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
@@ -87,9 +87,9 @@ void CbmLitFindMvdTracks::ReadAndCreateDataBranches() {
LOG(fatal) << "CbmLitFindMvdTracks::ReadAndCreateDataBranches "
"FairRootManager is not instantiated";
}
- fMvdHits = (TClonesArray*) ioman->GetObject("MvdHit");
- fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
+ fMvdHits = dynamic_cast<TClonesArray*>(ioman->GetObject("MvdHit"));
+ fStsTracks = dynamic_cast<TClonesArray*>(ioman->GetObject("StsTrack"));
+ fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
}
void CbmLitFindMvdTracks::ConvertInputData(CbmEvent* event) {
--
GitLab