adapt file reading part to new data structures for clusters and MC

wiechula · davidrohr · commit a740637a016f · 2020-10-15T11:43:14.000+02:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNativeHelper.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNativeHelper.h
@@ -18,6 +18,7 @@
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/ClusterGroupAttribute.h"
 #include "DataFormatsTPC/Constants.h"
+#include "SimulationDataFormat/IOMCTruthContainerView.h"
 #include "SimulationDataFormat/ConstMCTruthContainer.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include <gsl/gsl>
@@ -132,6 +133,7 @@ class ClusterNativeHelper
 {
  public:
   using MCLabelContainer = o2::dataformats::MCLabelContainer;
+  using ConstMCLabelContainer = o2::dataformats::ConstMCLabelContainer;
   using ConstMCLabelContainerView = o2::dataformats::ConstMCLabelContainerView;
   using ConstMCLabelContainerViewWithBuffer = ClusterNativeAccess::ConstMCLabelContainerViewWithBuffer;
 
@@ -279,10 +281,8 @@ class ClusterNativeHelper
     std::array<std::vector<char>*, NSectors> mSectorRaw = {nullptr};
     /// the array of raw buffers
     std::array<size_t, NSectors> mSectorRawSize = {0};
-    /// the array of MC label containers
-    std::array<std::vector<MCLabelContainer>, NSectors> mSectorMC;
     /// pointers on the elements of array of MC label containers
-    std::array<std::vector<MCLabelContainer>*, NSectors> mSectorMCPtr = {nullptr};
+    std::array<dataformats::IOMCTruthContainerView*, NSectors> mSectorMCPtr{};
   };
 
   /// @class TreeWriter
diff --git a/DataFormats/Detectors/TPC/src/ClusterNativeHelper.cxx b/DataFormats/Detectors/TPC/src/ClusterNativeHelper.cxx
@@ -114,10 +114,13 @@ void ClusterNativeHelper::Reader::init(const char* filename, const char* treenam
     LOG(ERROR) << "can not find tree " << mTreeName << " in file " << filename;
     return;
   }
+
+  const bool singleBranch = mTree->GetBranch(mDataBranchName.data());
+
   size_t nofDataBranches = 0;
   size_t nofMCBranches = 0;
   for (size_t sector = 0; sector < NSectors; ++sector) {
-    auto branchname = mDataBranchName + "_" + std::to_string(sector);
+    auto branchname = singleBranch ? mDataBranchName : mDataBranchName + "_" + std::to_string(sector);
     TBranch* branch = mTree->GetBranch(branchname.c_str());
     if (branch) {
       TBranch* sizebranch = mTree->GetBranch((branchname + "Size").c_str());
@@ -129,13 +132,16 @@ void ClusterNativeHelper::Reader::init(const char* filename, const char* treenam
         LOG(ERROR) << "can not find corresponding 'Size' branch for data branch " << branchname << ", skipping it";
       }
     }
-    branchname = mMCBranchName + "_" + std::to_string(sector);
+    branchname = singleBranch ? mMCBranchName : mMCBranchName + "_" + std::to_string(sector);
     branch = mTree->GetBranch(branchname.c_str());
     if (branch) {
-      mSectorMCPtr[sector] = &mSectorMC[sector];
       branch->SetAddress(&mSectorMCPtr[sector]);
       ++nofMCBranches;
     }
+
+    if (singleBranch) {
+      break;
+    }
   }
   LOG(INFO) << "reading " << nofDataBranches << " data branch(es) and " << nofMCBranches << " mc branch(es)";
 }
@@ -163,18 +169,28 @@ void ClusterNativeHelper::Reader::clear()
 int ClusterNativeHelper::Reader::fillIndex(ClusterNativeAccess& clusterIndex, std::unique_ptr<ClusterNative[]>& clusterBuffer,
                                            ConstMCLabelContainerViewWithBuffer& mcBuffer)
 {
+  std::vector<gsl::span<const char>> clustersTPC;
+  std::vector<ConstMCLabelContainer> constMCLabelContainers;
+  std::vector<ConstMCLabelContainerView> constMCLabelContainerViews;
+
   for (size_t index = 0; index < mSectorRaw.size(); ++index) {
-    if (mSectorRaw[index] && mSectorRaw[index]->size() != mSectorRawSize[index]) {
-      LOG(ERROR) << "inconsistent raw size for sector " << index << ": " << mSectorRaw[index]->size() << " v.s. " << mSectorRawSize[index];
-      mSectorRaw[index]->clear();
+    if (mSectorRaw[index]) {
+      if (mSectorRaw[index]->size() != mSectorRawSize[index]) {
+        LOG(ERROR) << "inconsistent raw size for sector " << index << ": " << mSectorRaw[index]->size() << " v.s. " << mSectorRawSize[index];
+        mSectorRaw[index]->clear();
+      } else {
+        clustersTPC.emplace_back(mSectorRaw[index]->data(), mSectorRawSize[index]);
+      }
+    }
+    if (mSectorMCPtr[index]) {
+      auto& view = constMCLabelContainers.emplace_back();
+      mSectorMCPtr[index]->copyandflatten(view);
+      constMCLabelContainerViews.emplace_back(view);
     }
   }
-  // after changing this ClusterNative transport format, this functionality needs
-  // to be adapted
-  throw std::runtime_error("code path currently not supported");
-  //int result = fillIndex(clusterIndex, clusterBuffer, mcBuffer, mSectorRaw, mSectorMC, [](auto&) { return true; });
-  //return result;
-  return 0;
+
+  int result = fillIndex(clusterIndex, clusterBuffer, mcBuffer, clustersTPC, constMCLabelContainerViews, [](auto&) { return true; });
+  return result;
 }
 
 int ClusterNativeHelper::Reader::parseSector(const char* buffer, size_t size, gsl::span<ConstMCLabelContainerView const> const& mcinput, ClusterNativeAccess& clusterIndex,
