Merge digits coming from in-bunch pile-up

dstocco · shahor02 · commit 98d0a21fa2c1 · 2019-12-09T15:27:03.000+01:00
diff --git a/Detectors/MUON/MID/Simulation/include/MIDSimulation/DigitsMerger.h b/Detectors/MUON/MID/Simulation/include/MIDSimulation/DigitsMerger.h
@@ -29,7 +29,7 @@ namespace mid
 class DigitsMerger
 {
  public:
-  void process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords);
+  void process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords, bool mergeInBunchPileup = true);
 
   /// Gets the merged column data
   const std::vector<ColumnData>& getColumnData() const { return mDigitStore; }
diff --git a/Detectors/MUON/MID/Simulation/src/DigitsMerger.cxx b/Detectors/MUON/MID/Simulation/src/DigitsMerger.cxx
@@ -33,32 +33,41 @@ void DigitsMerger::mergeDigit(size_t idigit, const std::vector<ColumnDataMC>& in
   mDigitsLabels.emplace_back(std::make_pair(inDigitStore[idigit], vec));
 }
 
-void DigitsMerger::process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords)
+void DigitsMerger::process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords, bool mergeInBunchPileup)
 {
   /// Merges the MC digits that are provided per hit
   /// into the format that we expect from data
   /// \param inDigitStore Vector of input MC digits
   /// \param inMCContainer Container with MC labels for input MC digits
   /// \param inROFRecords Vector with RO frame records
+  /// \param mergeInBunchPileup Merge the digits coming from in-bunch pileup
   mDigitStore.clear();
   mMCContainer.clear();
   mROFRecords.clear();
+  mDigitsLabels.clear();
 
-  for (auto& rofRecord : inROFRecords) {
-    mDigitsLabels.clear();
-    for (size_t idigit = rofRecord.firstEntry; idigit < rofRecord.firstEntry + rofRecord.nEntries; ++idigit) {
+  for (auto rofIt = inROFRecords.begin(); rofIt != inROFRecords.end(); ++rofIt) {
+    auto nextRofIt = rofIt + 1;
+    bool mergeInteractions = mergeInBunchPileup && nextRofIt != inROFRecords.end() && rofIt->interactionRecord == nextRofIt->interactionRecord;
+
+    for (size_t idigit = rofIt->firstEntry; idigit < rofIt->firstEntry + rofIt->nEntries; ++idigit) {
       mergeDigit(idigit, inDigitStore);
     }
 
+    if (mergeInteractions) {
+      continue;
+    }
+
     auto firstEntry = mDigitStore.size();
-    mROFRecords.emplace_back(rofRecord.interactionRecord, rofRecord.eventType, firstEntry, mDigitsLabels.size());
+    mROFRecords.emplace_back(rofIt->interactionRecord, rofIt->eventType, firstEntry, mDigitsLabels.size());
 
     for (auto pair : mDigitsLabels) {
       mDigitStore.emplace_back(pair.first);
       for (auto labelIdx : pair.second) {
         mMCContainer.addElements(mDigitStore.size() - 1, inMCContainer.getLabels(labelIdx));
       }
     }
+    mDigitsLabels.clear();
   }
 }
 } // namespace mid
diff --git a/Detectors/MUON/MID/Simulation/test/testSimulation.cxx b/Detectors/MUON/MID/Simulation/test/testSimulation.cxx
@@ -15,6 +15,7 @@
 #include <boost/test/data/test_case.hpp>
 #include <sstream>
 #include "MathUtils/Cartesian3D.h"
+#include "CommonConstants/LHCConstants.h"
 #include "DataFormatsMID/Cluster2D.h"
 #include "DataFormatsMID/Cluster3D.h"
 #include "DataFormatsMID/ColumnData.h"
@@ -303,7 +304,7 @@ BOOST_DATA_TEST_CASE(MID_DigitMerger, boost::unit_test::data::make(getDEList()),
     digitsCollection.push_back({});
     mcContainerCollection.push_back({});
     simDigitizer.digitizer.process(hits, digitsCollection.back(), mcContainerCollection.back());
-    rofRecords.emplace_back(10 * ievent, EventType::Standard, digits.size(), digitsCollection.back().size());
+    rofRecords.emplace_back(o2::constants::lhc::LHCBunchSpacingNS * ievent, EventType::Standard, digits.size(), digitsCollection.back().size());
     std::copy(digitsCollection.back().begin(), digitsCollection.back().end(), std::back_inserter(digits));
     mcContainer.mergeAtBack(mcContainerCollection.back());
   }
@@ -392,7 +393,7 @@ BOOST_DATA_TEST_CASE(MID_SingleCluster, boost::unit_test::data::make(getDEList()
     int nGenClusters = 1, nRecoClusters = 0;
     simDigitizer.digitizer.process(hits, digitStoreMC, digitLabelsMC);
     rofRecords.clear();
-    rofRecords.emplace_back(10 * ievent, EventType::Standard, 0, digitStoreMC.size());
+    rofRecords.emplace_back(o2::constants::lhc::LHCBunchSpacingNS * ievent, EventType::Standard, 0, digitStoreMC.size());
     simDigitizer.digitsMerger.process(digitStoreMC, digitLabelsMC, rofRecords);
     simClustering.preClusterizer.process(simDigitizer.digitsMerger.getColumnData(), simDigitizer.digitsMerger.getROFRecords());
     simClustering.clusterizer.process(simClustering.preClusterizer.getPreClusters(), simClustering.preClusterizer.getROFRecords());
@@ -432,7 +433,7 @@ BOOST_DATA_TEST_CASE(MID_SimClusters, boost::unit_test::data::make(getDEList()),
     auto hits = generateHits(10, deId, simBase.mapping, simBase.geoTrans);
     hitsCollection.emplace_back(hits);
     simDigitizer.digitizer.process(hits, digitStoreMC, digitLabelsMC);
-    digitsROF.emplace_back(ievent, EventType::Standard, digitsAccum.size(), digitStoreMC.size());
+    digitsROF.emplace_back(o2::constants::lhc::LHCBunchSpacingNS * ievent, EventType::Standard, digitsAccum.size(), digitStoreMC.size());
     std::copy(digitStoreMC.begin(), digitStoreMC.end(), std::back_inserter(digitsAccum));
     digitLabelsAccum.mergeAtBack(digitLabelsMC);
   }
@@ -505,7 +506,7 @@ BOOST_DATA_TEST_CASE(MID_SimTracks, boost::unit_test::data::make({1, 2, 3, 4, 5,
   // In the tracking algorithm, if we have two tracks that are compatible within uncertainties
   // we keep only one of the two. This is done to avoid duplicated tracks.
   // In this test we can have many tracks in the same event.
-  // If two tracks are close, they can give two reconstucted tracks compatible among each others,
+  // If two tracks are close, they can give two reconstructed tracks compatible among each others,
   // within their uncertainties. One of the two is therefore rejected.
   // However, the track might not be compatible with the (rejected) generated track that has no uncertainty.
   // To avoid this, compare adding a factor 2 in the sigma cut.
@@ -525,7 +526,7 @@ BOOST_DATA_TEST_CASE(MID_SimTracks, boost::unit_test::data::make({1, 2, 3, 4, 5,
     genTrackCollection.emplace_back(genTracks);
 
     simDigitizer.digitizerNoClusterSize.process(hits, digitStoreMC, digitLabelsMC);
-    digitsROF.emplace_back(ievent, EventType::Standard, digitsAccum.size(), digitStoreMC.size());
+    digitsROF.emplace_back(o2::constants::lhc::LHCBunchSpacingNS * ievent, EventType::Standard, digitsAccum.size(), digitStoreMC.size());
     std::copy(digitStoreMC.begin(), digitStoreMC.end(), std::back_inserter(digitsAccum));
     digitLabelsAccum.mergeAtBack(digitLabelsMC);
   }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace mid`
`29`	`29`	`class DigitsMerger`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`		`- void process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords);`
	`32`	`+ void process(const std::vector<ColumnDataMC>& inDigitStore, const o2::dataformats::MCTruthContainer<MCLabel>& inMCContainer, const std::vector<ROFRecord>& inROFRecords, bool mergeInBunchPileup = true);`
`33`	`33`
`34`	`34`	`/// Gets the merged column data`
`35`	`35`	`const std::vector<ColumnData>& getColumnData() const { return mDigitStore; }`