Fix clusterizer that was incorrectly handling large clusters

Author: dstocco

Detectors/MUON/MID/Base/src/Mapping.cxx

@@ -146,6 +146,9 @@ double Mapping::getStripSize(int strip, int cathode, int column, int deId) const
   int ichamber = Constants::getChamber(deId);
   int stripPitch = (cathode == 0) ? mDetectionElements[rpcType].columns[column].stripPitchBP
                                   : mDetectionElements[rpcType].columns[column].stripPitchNBP;
+  if (cathode == 0) {
+    strip = 0;
+  }
 
   return getStripSize(ichamber, stripPitch, strip);
 }

Detectors/MUON/MID/Clustering/include/MIDClustering/Clusterizer.h

@@ -74,7 +74,7 @@ class Clusterizer
   Cluster2D& nextCluster();
   void makeClusters(const int& deIndex);
   void makeCluster(PreCluster& clBend, PreCluster& clNonBend, const int& deIndex);
-  void makeCluster(std::vector<PreCluster*> pcBlist, const int& deIndex, PreCluster* clNonBend = nullptr);
+  void makeCluster(std::vector<PreCluster*>& pcBlist, const int& deIndex, PreCluster* clNonBend = nullptr);
 
   Mapping mMapping;                              ///< Mapping
   std::unordered_map<int, PatternStruct> mMpDEs; ///< internal mapping

Detectors/MUON/MID/Clustering/src/Clusterizer.cxx

@@ -150,7 +150,7 @@ void Clusterizer::preClusterizeNBP(PatternStruct& de)
         pc->area[icolumn].setXmax(limit);
         LOG(DEBUG) << "  adding col " << icolumn << "  strip " << istrip << "  (" << pc->area[icolumn].getXmin() << ", "
                    << pc->area[icolumn].getXmax() << ") (" << pc->area[icolumn].getYmin() << ", "
-                   << pc->area[icolumn].getYmax();
+                   << pc->area[icolumn].getYmax() << ")";
       } else {
         pc = nullptr;
       }
@@ -163,12 +163,12 @@ void Clusterizer::preClusterizeNBP(PatternStruct& de)
 void Clusterizer::preClusterizeBP(PatternStruct& de)
 {
   /// PreClusterizes bending plane
-  PreCluster* pc = nullptr;
   double limit = 0;
   for (int icolumn = mMapping.getFirstColumn(de.deId); icolumn < 7; ++icolumn) {
     if ((de.firedColumns & (1 << icolumn)) == 0) {
       continue;
     }
+    PreCluster* pc = nullptr;
     int firstLine = mMapping.getFirstBoardBP(icolumn, de.deId);
     int lastLine = mMapping.getLastBoardBP(icolumn, de.deId);
     for (int iline = firstLine; iline <= lastLine; ++iline) {
@@ -213,7 +213,7 @@ void Clusterizer::makeClusters(const int& deIndex)
     int icolumn = pcNB.firstColumn;
     if (icolumn == pcNB.lastColumn) {
       // This is the most simple and common case: the NBP pre-cluster is on
-      // on single column. So it can be easily matched with the BP
+      // one single column. So it can be easily matched with the BP
       // since the corresponding contours are both rectangles
       for (int ib = 0; ib < mNPreClusters[icolumn]; ++ib) {
         PreCluster& pcB = mPreClusters[icolumn][ib];
@@ -225,7 +225,7 @@ void Clusterizer::makeClusters(const int& deIndex)
       std::vector<std::vector<PreCluster*>> pcBneighbours;
       LOG(DEBUG) << "Spanning non-bend: " << icolumn << " -> " << pcNB.lastColumn;
       buildListOfNeighbours(icolumn, pcNB.lastColumn, pcBneighbours);
-      for (const auto pcBlist : pcBneighbours) {
+      for (auto& pcBlist : pcBneighbours) {
         makeCluster(pcBlist, deIndex, &pcNB);
       }
     }
@@ -241,7 +241,7 @@ void Clusterizer::makeClusters(const int& deIndex)
   /// Search for monocathodic clusters in the BP
   std::vector<std::vector<PreCluster*>> pcBneighbours;
   buildListOfNeighbours(0, 6, pcBneighbours, true);
-  for (const auto pcBlist : pcBneighbours) {
+  for (auto& pcBlist : pcBneighbours) {
     makeCluster(pcBlist, deIndex);
   }
 }
@@ -263,7 +263,7 @@ void Clusterizer::makeCluster(PreCluster& clBend, PreCluster& clNonBend, const i
 {
   /// Makes the cluster from pre-clusters
   Cluster2D& cl = nextCluster();
-  int icolumn = clNonBend.firstColumn;
+  int icolumn = clBend.firstColumn;
   cl.deId = (uint8_t)deIndex;
   cl.xCoor = 0.5 * (clNonBend.area[icolumn].getXmax() + clNonBend.area[icolumn].getXmin());
   cl.yCoor = 0.5 * (clBend.area[icolumn].getYmax() + clBend.area[icolumn].getYmin());
@@ -278,7 +278,7 @@ void Clusterizer::makeCluster(PreCluster& clBend, PreCluster& clNonBend, const i
 }
 
 //______________________________________________________________________________
-void Clusterizer::makeCluster(std::vector<PreCluster*> pcBlist, const int& deIndex, PreCluster* clNonBend)
+void Clusterizer::makeCluster(std::vector<PreCluster*>& pcBlist, const int& deIndex, PreCluster* clNonBend)
 {
   /// Makes the cluster from pre-clusters
   // This is the general case:

Detectors/MUON/MID/Clustering/test/testClusterizer.cxx

@@ -260,7 +260,7 @@ bool isWithinUncertainties(float xPos, float yPos, Cluster2D& cl)
 std::vector<ColumnData> getFiredStrips(float xPos, float yPos, int deId, Mapping& mapping)
 {
   // This is a quite simple case just for testing purposes.
-  // The fired strips are simply the fired stripp itself + its neighbours.
+  // The fired strips are simply the fired strip itself + its neighbours.
   // However, in the bending plane, this also consists of strips with no overlap
   // with the non-bending plane
   std::vector<ColumnData> columns;