ITS: use nsgima tgl tracklet cut

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Configuration.h

@@ -57,8 +57,6 @@ struct TrackingParameters {
   int NTimeSlices{1};
   /// Trackleting cuts
   float TrackletMinPt = 0.3f;
-  /// Cell finding cuts
-  float CellDeltaTanLambdaSigma = 0.007f;
   /// Fitter parameters
   o2::base::PropagatorImpl<float>::MatCorrType CorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrNONE;
   float MaxChi2ClusterAttachment = 60.f;

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingConfigParam.h

@@ -36,9 +36,6 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
   float maxChi2ClusterAttachment = -1.f;
   float maxChi2NDF = -1.f;
   float nSigmaCut = -1.f;
-  float nSigmaCutZ = -1.f;
-  float nSigmaCutPhi = -1.f;
-  float deltaTanLres = -1.f;
   float minPt = -1.f;
   int LUTbinsPhi = -1;
   int LUTbinsZ = -1;

Detectors/ITSMFT/ITS/tracking/src/Configuration.cxx

@@ -168,7 +168,6 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     p.PhiBins = tc.LUTbinsPhi > 0 ? tc.LUTbinsPhi : p.PhiBins;
     p.ZBins = tc.LUTbinsZ > 0 ? tc.LUTbinsZ : p.ZBins;
     p.NSigmaCut *= tc.nSigmaCut > 0 ? tc.nSigmaCut : 1.f;
-    p.CellDeltaTanLambdaSigma *= tc.deltaTanLres > 0 ? tc.deltaTanLres : 1.f;
     p.TrackletMinPt *= tc.minPt > 0 ? tc.minPt : 1.f;
     p.PerPrimaryVertexProcessing = tc.perPrimaryVertexProcessing;
     for (int iD{0}; iD < 3; ++iD) {
@@ -197,8 +196,9 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
 
     // standards steps to configure seeding
     recoIterations[0].steps.set(kRunTrackleting, kRunCellFinding, kRunCellSeeding, kUpdateClusters);
-    recoIterations[0].params.NLayers = 3;                                                   // only do cell finding up until the third layer
-    recoIterations[0].params.UseDiamond = true;                                             // use the blown up diamond constrain to (e.g. luminous region)
+    recoIterations[0].params.NLayers = 3;       // only do cell finding up until the third layer
+    recoIterations[0].params.UseDiamond = true; // use the blown up diamond constrain to (e.g. luminous region)
+    recoIterations[0].params.NSigmaCut = 3.f;
     recoIterations[0].params.CorrType = o2::base::PropagatorF::MatCorrType::USEMatCorrNONE; // do not use material
     recoIterations[0].params.SeedingDCATolerance = tc.seedingDCATolerance;
     recoIterations[0].params.SeedingDCAMaxPull = tc.seedingDCAMaxPull;
@@ -221,9 +221,7 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
 
   if (mode == TrackingMode::Async) {
     recoIterations[2].params.TrackletMinPt = 0.2f;
-    recoIterations[2].params.CellDeltaTanLambdaSigma *= 2.;
     recoIterations[3].params.TrackletMinPt = 0.1f;
-    recoIterations[3].params.CellDeltaTanLambdaSigma *= 4.;
 
     recoIterations[1].params.MinPt[0] = 1.f / 12; // 7cl
     recoIterations[2].params.MinPt[0] = 1.f / 12; // 7cl
@@ -239,7 +237,6 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     if (tc.doUPCIteration) {
       recoIterations[4].params.MinTrackLength = 4;
       recoIterations[4].params.TrackletMinPt = 0.1f;
-      recoIterations[4].params.CellDeltaTanLambdaSigma *= 4.;
     }
     for (size_t ip = 0; ip < recoIterations.size(); ip++) {
       // the seeding step is configured outside of this loop beforehand
@@ -273,7 +270,6 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     recoIterations[0].params.MinTrackLength = 4;
   } else if (mode == TrackingMode::Cosmics) {
     recoIterations[0].params.MinTrackLength = 4;
-    recoIterations[0].params.CellDeltaTanLambdaSigma *= 10;
     recoIterations[0].params.PhiBins = 4;
     recoIterations[0].params.ZBins = 16;
     recoIterations[0].params.MaxChi2ClusterAttachment = 60.;

Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx

@@ -359,9 +359,6 @@ void TrackerTraits<NLayers>::computeLayerCells(const int iteration)
     }
   }
 
-  // allowed tgl variation
-  const float tglNSigma = mRecoParams[iteration].params.CellDeltaTanLambdaSigma * mRecoParams[iteration].params.NSigmaCut;
-
   mTaskArena->execute([&] {
     auto forTrackletCells = [&](auto Tag, int iLayer, bounded_vector<CellSeedN>& layerCells, int iTracklet, int offset = 0) -> int {
       const Tracklet& currentTracklet{mTimeFrame->getTracklets()[iLayer][iTracklet]};
@@ -372,6 +369,8 @@ void TrackerTraits<NLayers>::computeLayerCells(const int iteration)
       // properties for the middle layer
       const float resMid2 = math_utils::Sq(mTimeFrame->getPositionResolution(iLayer + 1));
       const float msMid2 = math_utils::Sq(mTimeFrame->getMSangle(iLayer + 1));
+      // the allowed tgl variance is entirely determined by the middle layer
+      const float tglNSigma = o2::gpu::CAMath::Sqrt(resMid2 + msMid2) * mRecoParams[iteration].params.NSigmaCut;
 
       int foundCells{0};
       for (int iNextTracklet{nextLayerFirstTrackletIndex}; iNextTracklet < nextLayerLastTrackletIndex; ++iNextTracklet) {
@@ -1855,6 +1854,7 @@ inline void TrackerTraits<NLayers>::debugComputeLayerTracklets(int iteration, in
   const float tanLambda = deltaPvZ / currentCls.radius;
   const float deltaZ = o2::gpu::GPUCommonMath::Abs((tanLambda * (nextCls.radius - currentCls.radius)) + currentCls.zCoordinate - nextCls.zCoordinate);
   const float tglNext = (nextCls.zCoordinate - pv.getZ()) / nextCls.radius;
+  const float deltaZ2Pv = nextCls.zCoordinate + ((nextCls.zCoordinate - currentCls.zCoordinate) / (nextCls.radius - currentCls.radius) * (nextCls.radius - pv.getR()));
   const float deltaPhi = o2::gpu::CAMath::Abs(o2::math_utils::toPMPi(currentCls.phi - nextCls.phi));
 
   static MCStat stats("trackleting");
@@ -1873,6 +1873,7 @@ inline void TrackerTraits<NLayers>::debugComputeLayerTracklets(int iteration, in
              << "delPhi=" << deltaPhi
              << "tgl=" << tanLambda
              << "tglNext=" << tglNext
+             << "delZPv=" << deltaZ2Pv
              << "acc=" << accepted
              << "\n";
 }
@@ -1914,10 +1915,10 @@ inline void TrackerTraits<NLayers>::debugComputeLayerCells(int iteration, int la
   const float snl2 = tgl2 / (1.f + tgl2);
   const float resMid2 = math_utils::Sq(mTimeFrame->getPositionResolution(layer + 1));
   const float msMid2 = math_utils::Sq(mTimeFrame->getMSangle(layer + 1));
+  const float tglNSigma = o2::gpu::CAMath::Sqrt(resMid2 + msMid2) * mRecoParams[iteration].params.NSigmaCut;
   const float kSigma2Pos = 6.f * resMid2 / math_utils::Sq(dR2);
   const float kSigma2MS = msMid2 / (dR2 * snl2);
   const float kNSigma = mRecoParams[iteration].params.NSigmaCut * o2::gpu::CAMath::Sqrt(kSigma2Pos + kSigma2MS);
-  const float tglNSigma = mRecoParams[iteration].params.CellDeltaTanLambdaSigma * mRecoParams[iteration].params.NSigmaCut;
 
   bool accepted = dk < kNSigma && delTgl < tglNSigma;
 

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

@@ -98,7 +98,6 @@ void ITSTrackingInterface::run(framework::ProcessingContext& pc)
       rofTable.defineLayer(iLayer, timing);
       vtxTable.defineLayer(iLayer, timing);
       sliceTable.defineLayer(iLayer, timing);
-      LOG(info) << "lay:" << iLayer << " -> " << timing.asString();
     }
     rofTable.init();
     mTimeFrame->setROFOverlapTable(rofTable);