FT0 RecPoints Reader treats each tree entry as new TF

shahor02 · shahor02 · commit 20f4cd14493d · 2020-04-13T13:44:46.000+02:00
diff --git a/Detectors/FIT/workflow/include/FITWorkflow/FT0RecPointReaderSpec.h b/Detectors/FIT/workflow/include/FITWorkflow/FT0RecPointReaderSpec.h
@@ -14,6 +14,7 @@
 #define O2_FT0_RECPOINTREADER
 
 #include "TFile.h"
+#include "TTree.h"
 
 #include "Framework/DataProcessorSpec.h"
 #include "Framework/Task.h"
@@ -35,7 +36,11 @@ class RecPointReader : public Task
   void run(ProcessingContext& pc) final;
 
  private:
-  bool mFinished = false;
+  void connectTree(const std::string& filename);
+
+  std::unique_ptr<TFile> mFile;
+  std::unique_ptr<TTree> mTree;
+
   bool mUseMC = true; // use MC truth
   o2::header::DataOrigin mOrigin = o2::header::gDataOriginFT0;
 
diff --git a/Detectors/FIT/workflow/src/FT0RecPointReaderSpec.cxx b/Detectors/FIT/workflow/src/FT0RecPointReaderSpec.cxx
@@ -37,41 +37,39 @@ RecPointReader::RecPointReader(bool useMC)
 void RecPointReader::init(InitContext& ic)
 {
   mInputFileName = ic.options().get<std::string>("ft0-recpoints-infile");
+  connectTree(mInputFileName);
 }
 
 void RecPointReader::run(ProcessingContext& pc)
 {
-  if (mFinished) {
-    return;
-  }
+  auto ent = mTree->GetReadEntry() + 1;
+  assert(ent < mTree->GetEntries()); // this should not happen
+  mTree->GetEntry(ent);
+
+  LOG(INFO) << "FT0 RecPointReader pushes " << mRecPoints->size() << " recpoints at entry " << ent;
+  pc.outputs().snapshot(Output{mOrigin, "RECPOINTS", 0, Lifetime::Timeframe}, *mRecPoints);
 
-  { // load data from files
-    TFile rpFile(mInputFileName.c_str(), "read");
-    if (rpFile.IsZombie()) {
-      LOG(FATAL) << "Failed to open FT0 recpoints file " << mInputFileName;
-    }
-    TTree* rpTree = (TTree*)rpFile.Get(mRecPointTreeName.c_str());
-    if (!rpTree) {
-      LOG(FATAL) << "Failed to load FT0 recpoints tree " << mRecPointTreeName << " from " << mInputFileName;
-    }
-    LOG(INFO) << "Loaded FT0 recpoints tree " << mRecPointTreeName << " from " << mInputFileName;
-
-    rpTree->SetBranchAddress(mRecPointBranchName.c_str(), &mRecPoints);
-    if (mUseMC) {
-      LOG(WARNING) << "MC-truth is not supported for FT0 recpoints currently";
-      mUseMC = false;
-    }
-
-    rpTree->GetEntry(0);
-    delete rpTree;
-    rpFile.Close();
+  if (mTree->GetReadEntry() + 1 >= mTree->GetEntries()) {
+    pc.services().get<ControlService>().endOfStream();
+    pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
   }
+}
 
-  LOG(INFO) << "FT0 RecPointReader pushes " << mRecPoints->size() << " recpoints";
-  pc.outputs().snapshot(Output{mOrigin, "RECPOINTS", 0, Lifetime::Timeframe}, *mRecPoints);
+void RecPointReader::connectTree(const std::string& filename)
+{
+  mTree.reset(nullptr); // in case it was already loaded
+  mFile.reset(TFile::Open(filename.c_str()));
+  assert(mFile && !mFile->IsZombie());
+  mTree.reset((TTree*)mFile->Get(mRecPointTreeName.c_str()));
+  assert(mTree);
+
+  mTree->SetBranchAddress(mRecPointBranchName.c_str(), &mRecPoints);
+  if (mUseMC) {
+    LOG(WARNING) << "MC-truth is not supported for FT0 recpoints currently";
+    mUseMC = false;
+  }
 
-  mFinished = true;
-  pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
+  LOG(INFO) << "Loaded FT0 RecPoints tree from " << filename << " with " << mTree->GetEntries() << " entries";
 }
 
 DataProcessorSpec getFT0RecPointReaderSpec(bool useMC)
