Changes in TPC residuals validation

Author: shahor02

Detectors/TPC/calibration/SpacePoints/include/SpacePoints/TrackInterpolation.h

@@ -489,7 +489,8 @@ class TrackInterpolation
   float mBz;                                          ///< required for helix approximation
   bool mInitDone{false};                              ///< initialization done flag
   size_t mRejectedResiduals{};                        ///< number of rejected residuals
-
+  size_t mNRejRefit = 0;
+  
   ClassDefNV(TrackInterpolation, 1);
 };
 

Detectors/TPC/calibration/SpacePoints/src/TrackInterpolation.cxx

@@ -374,7 +374,6 @@ void TrackInterpolation::process()
   trackIndices.insert(trackIndices.end(), mTrackIndices[mTrackTypes[GTrackID::ITSTPCTRD]].begin(), mTrackIndices[mTrackTypes[GTrackID::ITSTPCTRD]].end());
   trackIndices.insert(trackIndices.end(), mTrackIndices[mTrackTypes[GTrackID::ITSTPCTOF]].begin(), mTrackIndices[mTrackTypes[GTrackID::ITSTPCTOF]].end());
   trackIndices.insert(trackIndices.end(), mTrackIndices[mTrackTypes[GTrackID::ITSTPC]].begin(), mTrackIndices[mTrackTypes[GTrackID::ITSTPC]].end());
-
   int nSeeds = mSeeds.size(), lastChecked = 0;
   mParentID.clear();
   mParentID.resize(nSeeds, -1);
@@ -439,7 +438,9 @@ void TrackInterpolation::process()
     remSeeds.resize(mSeeds.size() - lastChecked);
     std::iota(remSeeds.begin(), remSeeds.end(), lastChecked);
     std::shuffle(remSeeds.begin(), remSeeds.end(), g);
-    LOGP(info, "Up to {} tracks out of {} additional seeds will be processed in random order, of which {} are stripped versions, accepted seeds: {}", mAddTracksForMapPerTF, remSeeds.size(), mSeeds.size() - nSeeds, mTrackDataCompact.size());
+    LOGP(info, "Up to {} tracks out of {} additional seeds will be processed in random order, of which {} are stripped versions, accepted seeds: {}",
+	 mAddTracksForMapPerTF > 0 ? mAddTracksForMapPerTF : remSeeds.size() ,
+	 remSeeds.size(), mSeeds.size() - nSeeds, mTrackDataCompact.size());
   }
   int extraChecked = 0;
   for (int iSeed : remSeeds) {
@@ -456,8 +457,10 @@ void TrackInterpolation::process()
       extrapolateTrack(iSeed);
     }
   }
-  LOG(info) << "Could process " << mTrackData.size() << " tracks successfully. " << mRejectedResiduals << " residuals were rejected. " << mClRes.size() << " residuals were accepted.";
+  LOGP(info, "Could process {} tracks successfully ({} rejected in refits), {} residuals were rejected, {} accepted",
+       mTrackData.size(), mNRejRefit, mRejectedResiduals, mClRes.size());
   mRejectedResiduals = 0;
+  mNRejRefit = 0;
 }
 
 void TrackInterpolation::interpolateTrack(int iSeed)
@@ -486,6 +489,7 @@ void TrackInterpolation::interpolateTrack(int iSeed)
     }
   }
   if (mParams->refitITS && !refITSTrack(gidTable[GTrackID::ITS], iSeed)) {
+    mNRejRefit++;
     return;
   }
   trackData.gid = mGIDs[iSeed];
@@ -952,6 +956,7 @@ void TrackInterpolation::extrapolateTrack(int iSeed)
     }
   }
   if (mParams->refitITS && !refITSTrack(gidTable[GTrackID::ITS], iSeed)) {
+     mNRejRefit++;
     return;
   }
   trackData.gid = mGIDs[iSeed];