New addElements interface for MCTruthContainer

sawenzel · sawenzel · commit bee4172704b2 · 2018-01-28T20:51:51.000+01:00
As per suggestion of David Rohr.

Use new interface in TOF digitizer
diff --git a/DataFormats/simulation/include/SimulationDataFormat/MCTruthContainer.h b/DataFormats/simulation/include/SimulationDataFormat/MCTruthContainer.h
@@ -19,6 +19,7 @@
 #include <cassert>
 #include <stdexcept>
 #include <gsl/gsl> // for guideline support library; array_view
+#include <type_traits>
 
 namespace o2
 {
@@ -115,6 +116,28 @@ class MCTruthContainer
     mTruthArray.emplace_back(element);
   }
 
+  // convenience interface to add multiple labels at once
+  // can use elements of any assignable type or sub-type
+  template <typename CompatibleLabel>
+  void addElements(uint dataindex, gsl::span<CompatibleLabel> elements)
+  {
+    static_assert(std::is_same<TruthElement, CompatibleLabel>::value ||
+                    std::is_assignable<TruthElement, CompatibleLabel>::value ||
+                    std::is_base_of<TruthElement, CompatibleLabel>::value,
+                  "Need to add compatible labels");
+    for (auto& e : elements) {
+      addElement(dataindex, e);
+    }
+  }
+
+  template <typename CompatibleLabel>
+  void addElements(uint dataindex, const std::vector<CompatibleLabel>& v)
+  {
+    using B = typename std::remove_const<CompatibleLabel>::type;
+    auto s = gsl::span<CompatibleLabel>(const_cast<B*>(&v[0]), v.size());
+    addElements(dataindex, s);
+  }
+
   // Add element at last position or for a previous index
   // (at random access position).
   // This might be a slow process since data has to be moved internally
diff --git a/DataFormats/simulation/test/testMCTruthContainer.cxx b/DataFormats/simulation/test/testMCTruthContainer.cxx
@@ -68,6 +68,16 @@ BOOST_AUTO_TEST_CASE(MCTruth)
   view = copy.getLabels(2);
   BOOST_CHECK(view.size() == 1);
   BOOST_CHECK(view[0] == 10);
+
+  // add multiple labels
+  std::vector<TruthElement> newlabels = { 101, 102, 103 };
+  container.addElements(2, newlabels);
+  view = container.getLabels(2);
+  BOOST_CHECK(view.size() == 4);
+  BOOST_CHECK(view[0] == 10);
+  BOOST_CHECK(view[1] == 101);
+  BOOST_CHECK(view[2] == 102);
+  BOOST_CHECK(view[3] == 103);
 }
 
 BOOST_AUTO_TEST_CASE(MCTruth_RandomAccess)
diff --git a/Detectors/TOF/simulation/src/DigitizerTask.cxx b/Detectors/TOF/simulation/src/DigitizerTask.cxx
@@ -92,10 +92,7 @@ void DigitizerTask::Exec(Option_t* option)
     // copy from transientTruthContainer to mMCTruthAray
     // a brute force solution for the moment; should be handled by a dedicated API
     for (int index = 0; index < transientTruthContainer.getIndexedSize(); ++index) {
-      auto labels = transientTruthContainer.getLabels(index);
-      for (auto& l : labels) {
-        mMCTruthArray->addElement(index, l);
-      }
+      mMCTruthArray->addElements(index, transientTruthContainer.getLabels(index));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,7 @@ void DigitizerTask::Exec(Option_t* option)`
`92`	`92`	`// copy from transientTruthContainer to mMCTruthAray`
`93`	`93`	`// a brute force solution for the moment; should be handled by a dedicated API`
`94`	`94`	`for (int index = 0; index < transientTruthContainer.getIndexedSize(); ++index) {`
`95`		`- auto labels = transientTruthContainer.getLabels(index);`
`96`		`- for (auto& l : labels) {`
`97`		`- mMCTruthArray->addElement(index, l);`
`98`		`- }`
	`95`	`+ mMCTruthArray->addElements(index, transientTruthContainer.getLabels(index));`
`99`	`96`	`}`
`100`	`97`	`}`
`101`	`98`