Added switch to toggle between clusterization algorithms.

Allow to switch between the two clusterization algorithms
in the DigitizationAlgorithm.

Revert "Remove switch to toggle clusterization."

This reverts commit f376e06a6ef80b9ef7a1d2babeb0ea9c32efe3db.

Revert "Revert "Restore alt switch.""

This reverts commit 6a49a0a383845ca01b596b2828fd1028bc6dca40.

Author: Goetz Gaycken

Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationAlgorithm.hpp

@@ -82,6 +82,8 @@ class DigitizationAlgorithm final : public IAlgorithm {
     /// Minimum number of attempts to derive a valid dgitized measurement when
     /// random numbers are involved.
     std::size_t minMaxRetries = 10;
+    /// use alternative clusterization
+    bool alt = false;
   };
 
   /// Construct the smearing algorithm.

Examples/Algorithms/Digitization/include/ActsExamples/Digitization/ModuleClusters.hpp

@@ -40,12 +40,13 @@ class ModuleClusters {
 
   ModuleClusters(Acts::BinUtility segmentation,
                  std::vector<Acts::BoundIndices> geoIndices, bool merge,
-                 double nsigma, bool commonCorner)
+                 double nsigma, bool commonCorner, bool alt = false)
       : m_segmentation(std::move(segmentation)),
         m_geoIndices(std::move(geoIndices)),
         m_merge(merge),
         m_nsigma(nsigma),
-        m_commonCorner(commonCorner) {}
+        m_commonCorner(commonCorner),
+        m_alt(alt) {}
 
   void add(DigitizedParameters params, simhit_t simhit);
   std::vector<std::pair<DigitizedParameters, std::set<simhit_t>>>
@@ -58,6 +59,7 @@ class ModuleClusters {
   bool m_merge;
   double m_nsigma;
   bool m_commonCorner;
+  bool m_alt;
 
   std::vector<ModuleValue> createCellCollection();
   void merge();

Examples/Algorithms/Digitization/src/DigitizationAlgorithm.cpp

@@ -196,11 +196,13 @@ ProcessCode DigitizationAlgorithm::execute(const AlgorithmContext& ctx) const {
 
     // Run the digitizer. Iterate over the hits for this surface inside the
     // visitor so we do not need to lookup the variant object per-hit.
+
     std::visit(
         [&](const auto& digitizer) {
-          ModuleClusters moduleClusters(
-              digitizer.geometric.segmentation, digitizer.geometric.indices,
-              m_cfg.doMerge, m_cfg.mergeNsigma, m_cfg.mergeCommonCorner);
+          ModuleClusters moduleClusters(digitizer.geometric.segmentation,
+                                        digitizer.geometric.indices,
+                                        m_cfg.doMerge, m_cfg.mergeNsigma,
+                                        m_cfg.mergeCommonCorner, m_cfg.alt);
 
           for (auto h = moduleSimHits.begin(); h != moduleSimHits.end(); ++h) {
             const auto& simHit = *h;

Examples/Algorithms/Digitization/src/ModuleClusters.cpp

@@ -251,7 +251,7 @@ void ModuleClusters::mergeAltImpl() {
 }
 
 void ModuleClusters::merge() {
-  if (!m_moduleValues.empty() &&
+  if (m_alt && !m_moduleValues.empty() &&
       std::holds_alternative<Cluster::Cell>(m_moduleValues.front().value)) {
     return mergeAlt();
   }

Examples/Python/python/acts/examples/simulation.py

@@ -746,6 +746,7 @@ def addDigitization(
     rnd: Optional[acts.examples.RandomNumbers] = None,
     doMerge: Optional[bool] = None,
     mergeCommonCorner: Optional[bool] = None,
+    alt: Optional[bool] = None,
     minEnergyDeposit: Optional[float] = None,
     logLevel: Optional[acts.logging.Level] = None,
 ) -> acts.examples.Sequencer:
@@ -786,6 +787,7 @@ def addDigitization(
         **acts.examples.defaultKWArgs(
             doMerge=doMerge,
             mergeCommonCorner=mergeCommonCorner,
+            alt=alt,
         ),
     )
 

Examples/Python/src/Digitization.cpp

@@ -56,7 +56,7 @@ void addDigitization(Context& ctx) {
         outputParticleMeasurementsMap, outputSimHitMeasurementsMap,
         surfaceByIdentifier, randomNumbers, doOutputCells, doClusterization,
         doMerge, mergeCommonCorner, minEnergyDeposit, digitizationConfigs,
-        minMaxRetries);
+        minMaxRetries, alt);
 
     c.def_readonly("mergeNsigma", &Config::mergeNsigma);