ITS3: fix topologydict generation

Author: f3sch

Detectors/Upgrades/ITS3/macros/test/CreateDictionariesITS3.C

@@ -280,15 +280,16 @@ void CreateDictionariesITS3(bool saveDeltas = true,
                   mMosaixSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlat, yFlat);
                   locC.SetCoordinates(xFlat, yFlat, locC.Z());
                 }
+
+                auto pitchX = (ib) ? o2::its3::SegmentationMosaix::PitchRow : o2::itsmft::SegmentationAlpide::PitchRow;
+                auto pitchZ = (ib) ? o2::its3::SegmentationMosaix::PitchCol : o2::itsmft::SegmentationAlpide::PitchCol;
                 dX = xyzLocM.X() - locC.X();
                 dZ = xyzLocM.Z() - locC.Z();
-                dX /= (ib) ? o2::its3::SegmentationMosaix::PitchRow : o2::itsmft::SegmentationAlpide::PitchRow;
-                dZ /= (ib) ? o2::its3::SegmentationMosaix::PitchCol : o2::itsmft::SegmentationAlpide::PitchCol;
 
                 float outLimitDx{-1}, outLimitDz{-1};
                 if (checkOutliers > 0.) {
-                  outLimitDx = topology.getRowSpan() * checkOutliers;
-                  outLimitDz = topology.getColumnSpan() * checkOutliers;
+                  outLimitDx = topology.getRowSpan() * checkOutliers * pitchX;
+                  outLimitDz = topology.getColumnSpan() * checkOutliers * pitchZ;
                   bool isOutDx = std::abs(dX) > outLimitDx;
                   bool isOutDz = std::abs(dZ) > outLimitDz;
                   if (isOutDx || isOutDz) { // ignore outlier

Detectors/Upgrades/ITS3/reconstruction/src/BuildTopologyDictionary.cxx

@@ -40,8 +40,6 @@ void BuildTopologyDictionary::accountTopologyImpl(const itsmft::ClusterTopology&
   ++tot;
   bool useDf = dX < IgnoreVal / 2; // we may need to account the frequency but to not update the centroid
 
-  // std::pair<unordered_map<unsigned long, itsmft::TopoStat>::iterator,bool> ret;
-  // auto ret = mTopologyMap.insert(std::make_pair(cluster.getHash(), std::make_pair(cluster, 1)));
   auto& topoStat = tstat[cluster.getHash()];
   topoStat.countsTotal++;
   if (topoStat.countsTotal == 1) { // a new topology is inserted
@@ -59,7 +57,7 @@ void BuildTopologyDictionary::accountTopologyImpl(const itsmft::ClusterTopology&
       topoStat.countsWithBias = 1;
     } else { // assign expected sigmas from the pixel X, Z sizes
       topInf.mXsigma2 = sigmaX * sigmaX / 12.f / (float)std::min(10, topInf.mSizeX);
-      topInf.mZsigma2 = sigmaZ * sigmaZ / (float)std::min(10, topInf.mSizeZ);
+      topInf.mZsigma2 = sigmaZ * sigmaZ / 12.f / (float)std::min(10, topInf.mSizeZ);
     }
     tinfo.emplace(cluster.getHash(), topInf);
   } else {
@@ -128,7 +126,7 @@ void BuildTopologyDictionary::setThresholdImpl(double thr, TopoFreq& tfreq, Topo
 {
   setNCommonImpl(0, tfreq, tstat, ncommon, ntot);
   freqthres = thr;
-  for (auto& q : tfreq) {
+  for (const auto& q : tfreq) {
     if (((double)q.first) / ntot > thr) {
       ++ncommon;
     } else {
@@ -205,7 +203,7 @@ void BuildTopologyDictionary::groupRareTopologiesImpl(TopoFreq& tfreq, TopoInfo&
     gr.mHash = tfreq[j].second;
     gr.mFrequency = ((double)(tfreq[j].first)) / ntot;
     totFreq += gr.mFrequency;
-    // rough estimation for the error considering a8 uniform distribution
+    // rough estimation for the error considering a uniform distribution
     const auto& topo = tinfo.find(gr.mHash)->second;
     gr.mErrX = std::sqrt(topo.mXsigma2);
     gr.mErrZ = std::sqrt(topo.mZsigma2);