Merge pull request #495 in B2/basf2 from bugfix/BII-8901-r6 to release/06-00

* commit 'f6ad1b6c62899e203468f31c8c1b4fc081392a3c':
  Simplify the first switch between release-05 and release-06 versions; Better clarify that the fix is temporary
  Fix segfault error in ECLCRFinder module when very noisy events are processed

Author: GiacomoXT

ecl/modules/eclCRFinder/include/ECLCRFinderModule.h

@@ -81,6 +81,8 @@ namespace Belle2 {
     int m_fullBkgdCount; /**< Number of expected background digits at full background. TODO move to DB*/
 
     /** Other variables. */
+    bool m_isOnlineProcessing{false}; /**< flag for identifying the online processing. */
+
     double m_energyCutMod[3] {}; /**< modified energy cut taking into account bkgd per event for seed, neighbours, ...*/
     int m_tempCRId = -1; /**< Temporary CR ID*/
 

ecl/modules/eclCRFinder/src/ECLCRFinderModule.cc

@@ -10,7 +10,9 @@
 #include <ecl/modules/eclCRFinder/ECLCRFinderModule.h>
 
 // FRAMEWORK
+#include <framework/core/Environment.h>
 #include <framework/gearbox/Unit.h>
+#include <framework/logging/LogConfig.h>
 #include <framework/logging/Logger.h>
 
 //ECL
@@ -125,11 +127,17 @@ void ECLCRFinderModule::initialize()
   m_cellIdToTempCRIdVec.resize(8737); /**< cellid -> CR. */
   m_calDigitStoreArrPosition.resize(8737);
 
+  // Check if we are running this module online
+  m_isOnlineProcessing = (Environment::Instance().getRealm() == LogConfig::c_Online) ? true : false;
+  if (m_isOnlineProcessing) {
+    m_energyCut[1] = 1.5 * Belle2::Unit::MeV;
+    m_energyCutBkgd[1] = 1.5 * Belle2::Unit::MeV;
+  }
 }
 
 void ECLCRFinderModule::beginRun()
 {
-  ;
+
 }
 
 void ECLCRFinderModule::event()
@@ -239,9 +247,14 @@ void ECLCRFinderModule::event()
 
   //-------------------------------------------------------
   // 'find" in a map is faster if the number of seeds is not too large, can be replaced easily once we know what seed cuts we want.
+  // This is weird: if we are running online, we use behaviour that was in place until release-05,
+  // otherwise we use the one implemented since release-06
+  // This is fundamental for avoiding a segfault error caused by veeery noisy ECL events,
+  // but note it is a temporary fix.
   for (unsigned int pos = 1; pos < m_cellIdToSeedVec.size(); ++pos) {
-    if (m_cellIdToSeedVec[pos] > 0 and m_cellIdToCheckVec[pos] == 0) {
-      m_cellIdToCheckVec[pos] = 1;
+    // check for m_isOnlineProcessing is for release-05 behaviour
+    if (m_cellIdToSeedVec[pos] > 0 and (m_cellIdToCheckVec[pos] == 0 or m_isOnlineProcessing)) {
+      if (!m_isOnlineProcessing) m_cellIdToCheckVec[pos] = 1; // release-06 and newer versions
       checkNeighbours(pos, m_tempCRId, 0);
       ++m_tempCRId; // This is just a number, will be replaced by a consecutive number later in this module
     }
@@ -332,10 +345,19 @@ void ECLCRFinderModule::checkNeighbours(const int cellid, const int tempcrid, co
 
       B2DEBUG(300, "  --> ECLCRFinderModule::checkNeighbours(): m_cellIdToTempCRIdVec[" << neighbour << "] " <<
               m_cellIdToTempCRIdVec[neighbour]);
-      if (m_cellIdToCheckVec[neighbour] == 0) { // only check again if we have not looked at that digit before
-        m_cellIdToCheckVec[neighbour] = 1;
-        checkNeighbours(neighbour, tempcrid, 1);
-
+      // This is weird: if we are running online, we use behaviour that was in place until release-05,
+      // otherwise we use the one implemented since release-06
+      // This is fundamental for avoiding a segfault error caused by veeery noisy ECL events,
+      // but note it is a temporary fix.
+      if (m_isOnlineProcessing) { // release-05
+        if (m_cellIdToTempCRIdVec[neighbour] == 0) { // found
+          checkNeighbours(neighbour, tempcrid, 1);
+        }
+      } else { // release-06 and newer versions
+        if (m_cellIdToCheckVec[neighbour] == 0) { // only check again if we have not looked at that digit before
+          m_cellIdToCheckVec[neighbour] = 1;
+          checkNeighbours(neighbour, tempcrid, 1);
+        }
       }
     }
   }