ClusterNativeHelper fixing convert to tree method

matthias-kleiner · shahor02 · commit 2dfa6f7dd5fb · 2021-10-07T15:28:58.000+02:00
diff --git a/DataFormats/Detectors/TPC/src/ClusterNativeHelper.cxx b/DataFormats/Detectors/TPC/src/ClusterNativeHelper.cxx
@@ -240,9 +240,6 @@ ClusterNativeHelper::TreeWriter::~TreeWriter()
 
 void ClusterNativeHelper::TreeWriter::init(const char* filename, const char* treename)
 {
-  // after changing this ClusterNative transport format, this functionality needs
-  // to be adapted
-  throw std::runtime_error("code path currently not supported");
   mFile.reset(TFile::Open(filename, "RECREATE"));
   if (!mFile) {
     return;
@@ -274,6 +271,7 @@ int ClusterNativeHelper::TreeWriter::fillFrom(ClusterNativeAccess const& cluster
       }
     }
   }
+  ++mEvent;
   return result;
 }
 
@@ -285,9 +283,8 @@ int ClusterNativeHelper::TreeWriter::fillFrom(int sector, int padrow, ClusterNat
   mStoreClusters.resize(nClusters, BranchData{sector, padrow});
   if (clusters != nullptr && nClusters > 0) {
     std::copy(clusters, clusters + nClusters, mStoreClusters.begin());
+    mTree->Fill();
   }
-  mTree->Fill();
-  ++mEvent;
   return nClusters;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,6 @@ ClusterNativeHelper::TreeWriter::~TreeWriter()`
`240`	`240`
`241`	`241`	`void ClusterNativeHelper::TreeWriter::init(const char* filename, const char* treename)`
`242`	`242`	`{`
`243`		`- // after changing this ClusterNative transport format, this functionality needs`
`244`		`- // to be adapted`
`245`		`- throw std::runtime_error("code path currently not supported");`
`246`	`243`	`mFile.reset(TFile::Open(filename, "RECREATE"));`
`247`	`244`	`if (!mFile) {`
`248`	`245`	`return;`
`@@ -274,6 +271,7 @@ int ClusterNativeHelper::TreeWriter::fillFrom(ClusterNativeAccess const& cluster`
`274`	`271`	`}`
`275`	`272`	`}`
`276`	`273`	`}`
	`274`	`+ ++mEvent;`
`277`	`275`	`return result;`
`278`	`276`	`}`
`279`	`277`
`@@ -285,9 +283,8 @@ int ClusterNativeHelper::TreeWriter::fillFrom(int sector, int padrow, ClusterNat`
`285`	`283`	`mStoreClusters.resize(nClusters, BranchData{sector, padrow});`
`286`	`284`	`if (clusters != nullptr && nClusters > 0) {`
`287`	`285`	`std::copy(clusters, clusters + nClusters, mStoreClusters.begin());`
	`286`	`+ mTree->Fill();`
`288`	`287`	`}`
`289`		`- mTree->Fill();`
`290`		`- ++mEvent;`
`291`	`288`	`return nClusters;`
`292`	`289`	`}`
`293`	`290`