Fix in cluster topology Lookup::findGroupID

Author: shahor02

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TopologyDictionary.h

@@ -171,9 +171,10 @@ class TopologyDictionary
   friend TopologyFastSimulation;
 
  private:
+  static constexpr int STopoSize = 8 * 255 + 1;
   std::unordered_map<unsigned long, int> mCommonMap; ///< Map of pair <hash, position in mVectorOfIDs>
   std::unordered_map<int, int> mGroupMap;            ///< Map of pair <groudID, position in mVectorOfIDs>
-  int mSmallTopologiesLUT[8 * 255 + 1];              ///< Look-Up Table for the topologies with 1-byte linearised matrix
+  int mSmallTopologiesLUT[STopoSize];                ///< Look-Up Table for the topologies with 1-byte linearised matrix
   std::vector<GroupStruct> mVectorOfIDs;             ///< Vector of topologies and groups
 
   ClassDefNV(TopologyDictionary, 4);

DataFormats/Detectors/ITSMFT/common/src/TopologyDictionary.cxx

@@ -33,7 +33,10 @@ namespace o2
 namespace itsmft
 {
 
-TopologyDictionary::TopologyDictionary() : mSmallTopologiesLUT{-1} {}
+TopologyDictionary::TopologyDictionary()
+{
+  memset(mSmallTopologiesLUT, -1, STopoSize * sizeof(int));
+}
 
 TopologyDictionary::TopologyDictionary(const std::string& fileName)
 {

Detectors/ITSMFT/common/reconstruction/src/LookUp.cxx

@@ -15,6 +15,7 @@
 /// \author Luca Barioglio, University and INFN of Torino
 
 #include "ITSMFTReconstruction/LookUp.h"
+#include "DataFormatsITSMFT/CompCluster.h"
 
 ClassImp(o2::itsmft::LookUp);
 
@@ -68,27 +69,24 @@ int LookUp::groupFinder(int nRow, int nCol)
 int LookUp::findGroupID(int nRow, int nCol, const unsigned char patt[ClusterPattern::MaxPatternBytes]) const
 {
   int nBits = nRow * nCol;
-  // Small topology
-  if (nBits < 9) {
+  if (nBits < 9) { // Small unique topology
     int ID = mDictionary.mSmallTopologiesLUT[(nCol - 1) * 255 + (int)patt[0]];
     if (ID >= 0) {
       return ID;
-    } else { //small rare topology (inside groups)
-      int index = groupFinder(nRow, nCol);
-      auto res = mDictionary.mGroupMap.find(index);
-      return res == mDictionary.mGroupMap.end() ? -1 : res->second;
+    }
+  } else { // Big unique topology
+    unsigned long hash = ClusterTopology::getCompleteHash(nRow, nCol, patt);
+    auto ret = mDictionary.mCommonMap.find(hash);
+    if (ret != mDictionary.mCommonMap.end()) {
+      return ret->second;
     }
   }
-  // Big topology
-  unsigned long hash = ClusterTopology::getCompleteHash(nRow, nCol, patt);
-  auto ret = mDictionary.mCommonMap.find(hash);
-  if (ret != mDictionary.mCommonMap.end()) {
-    return ret->second;
-  } else { // Big rare topology (inside groups)
+  if (!mDictionary.mGroupMap.empty()) { // rare valid topology group
     int index = groupFinder(nRow, nCol);
     auto res = mDictionary.mGroupMap.find(index);
-    return res == mDictionary.mGroupMap.end() ? -1 : res->second;
+    return res == mDictionary.mGroupMap.end() ? CompCluster::InvalidPatternID : res->second;
   }
+  return CompCluster::InvalidPatternID;
 }
 
 } // namespace itsmft