ITS: new upc settings

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

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

@@ -37,6 +37,7 @@ enum class IterationStep : uint8_t {
   RebuildClusterLUT,
   UseUPCMask,
   SelectUPCVertices,
+  UseDiamond,
   ResetVertices,
   SkipROFsAboveThreshold,
   MarkVerticesAsUPC,
@@ -66,7 +67,6 @@ struct TrackingParameters {
   std::vector<float> SystErrorZ2 = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
   int ZBins{256};
   int PhiBins{128};
-  bool UseDiamond = false;
   float Diamond[3] = {0.f, 0.f, 0.f};
   float DiamondCov[6] = {25.e-6f, 0.f, 0.f, 25.e-6f, 0.f, 36.f};
 

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

@@ -21,32 +21,32 @@ namespace o2::its
 {
 
 struct VertexerParamConfig : public o2::conf::ConfigurableParamHelper<VertexerParamConfig> {
+  static constexpr int MaxIter = 2;
   bool saveTimeBenchmarks = false; // dump metrics on file
 
   int nIterations = 1;         // Number of vertexing passes to perform.
   int vertPerRofThreshold = 0; // Maximum number of vertices per ROF to trigger second a iteration.
 
   // geometrical cuts for tracklet selection for Pb-Pb
-  float zCut = 0.002f;
-  float phiCut = 0.005f;
-  float pairCut = 0.017321f;
-  float clusterCut = 0.170048f;
-  float coarseZWindow = 0.055458f;
-  float seedDedupZCut = 0.116685f;
-  float refitDedupZCut = 0.039855f;
-  float duplicateZCut = 0.200097f;
-  float finalSelectionZCut = 0.034535f;
-  float duplicateDistance2Cut = 0.005117f;
-  float tanLambdaCut = 0.002f; // tanLambda = deltaZ/deltaR
-  float nSigmaCut = 0.0164651f;
-  float maxZPositionAllowed = 25.f; // 4x sZ of the beam
+  float zCut[MaxIter] = {0.002f};
+  float phiCut[MaxIter] = {0.005f};
+  float pairCut[MaxIter] = {0.017321f};
+  float clusterCut[MaxIter] = {0.170048f};
+  float coarseZWindow[MaxIter] = {0.055458f};
+  float seedDedupZCut[MaxIter] = {0.116685f};
+  float refitDedupZCut[MaxIter] = {0.039855f};
+  float duplicateZCut[MaxIter] = {0.200097f};
+  float finalSelectionZCut[MaxIter] = {0.034535f};
+  float duplicateDistance2Cut[MaxIter] = {0.005117f};
+  float tanLambdaCut[MaxIter] = {0.002f}; // tanLambda = deltaZ/deltaR
+  float nSigmaCut[MaxIter] = {0.0164651f};
+  int clusterContributorsCut[MaxIter] = {3}; // minimum number of contributors for an accepted final vertex
+  int suppressLowMultDebris[MaxIter] = {8};  // suppress all vertices below this threshold if a vertex was already found in a rof
+  int seedMemberRadiusTime[MaxIter] = {0};
+  int seedMemberRadiusZ[MaxIter] = {2};
+  int maxTrackletsPerCluster[MaxIter] = {100};
 
-  // Artefacts selections
-  int clusterContributorsCut = 3; // minimum number of contributors for an accepted final vertex
-  int suppressLowMultDebris = 16; // suppress all vertices below this threshold if a vertex was already found in a rof
-  int seedMemberRadiusTime = 0;
-  int seedMemberRadiusZ = 2;
-  int maxTrackletsPerCluster = 100;
+  float maxZPositionAllowed = 25.f; // 4x sZ of the beam
   int phiSpan = -1;
   int zSpan = -1;
   int ZBins = 1;     // z-phi index table configutation: number of z bins
@@ -84,27 +84,27 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
   float pvRes = -1.f;
   int LUTbinsPhi = -1;
   int LUTbinsZ = -1;
-  float diamondPos[3] = {0.f, 0.f, 0.f};   // override the position of the vertex
-  bool useDiamond = false;                 // enable overriding the vertex position
-  bool perPrimaryVertexProcessing = false; // perform the full tracking considering the vertex hypotheses one at the time.
-  bool saveTimeBenchmarks = false;         // dump metrics on file
-  bool overrideBeamEstimation = false;     // use beam position from meanVertex CCDB object
-  int trackingMode = -1;                   // -1: unset, 0=sync, 1=async, 2=cosmics used by gpuwf only
-  bool doUPCIteration = false;             // Perform an additional iteration for UPC events on tagged vertices. You want to combine this config with VertexerParamConfig.nIterations=2
-  int nIterations = constants::MaxIter;    // overwrite the number of iterations
-  int reseedIfShorter = 6;                 // for the final refit reseed the track with circle if they are shorter than this value
-  bool shiftRefToCluster{true};            // TrackFit: after update shift the linearization reference to cluster
-  bool repeatRefitOut{false};              // repeat outward refit using inward refit as a seed
-  bool createArtefactLabels{false};        // create on-the-fly labels for the artefacts
+  float diamondPos[3] = {0.f, 0.f, 0.f};         // override the position of the vertex
+  bool useDiamond[constants::MaxIter] = {false}; // enable overriding the vertex position in each iteration
+  bool perPrimaryVertexProcessing = false;       // perform the full tracking considering the vertex hypotheses one at the time.
+  bool saveTimeBenchmarks = false;               // dump metrics on file
+  bool overrideBeamEstimation = false;           // use beam position from meanVertex CCDB object
+  int trackingMode = -1;                         // -1: unset, 0=sync, 1=async, 2=cosmics used by gpuwf only
+  bool doUPCIteration = false;                   // Perform an additional iteration for UPC events on tagged vertices. You want to combine this config with VertexerParamConfig.nIterations=2
+  int nIterations = constants::MaxIter;          // overwrite the number of iterations
+  int reseedIfShorter = 6;                       // for the final refit reseed the track with circle if they are shorter than this value
+  bool shiftRefToCluster{true};                  // TrackFit: after update shift the linearization reference to cluster
+  bool repeatRefitOut{false};                    // repeat outward refit using inward refit as a seed
+  bool createArtefactLabels{false};              // create on-the-fly labels for the artefacts
 
   int nThreads = 1;
   bool printMemory = false;
   size_t maxMemory = std::numeric_limits<size_t>::max();
   bool dropTFUponFailure = false;
-  bool fataliseUponFailure = true;       // granular management of the fatalisation in async mode
+  bool fataliseUponFailure = true; // granular management of the fatalisation in async mode
 
   // Selections on tracks sharing clusters
-  bool allowSharingFirstCluster = false; // allow first cluster sharing among tracks
+  bool allowSharingFirstCluster = false;  // allow first cluster sharing among tracks
   float sharedClusterMaxDeltaPhi = 0.05f; // Maximum allowed delta phi at the cluster position
   float sharedClusterMaxDeltaEta = 0.03f; // Maximum allowed delta eta at the cluster position
   bool sharedClusterOppositeSign = false; // Require opposite sign of the tracklets

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

@@ -24,7 +24,7 @@ using namespace o2::its;
 
 std::string TrackingParameters::asString() const
 {
-  std::string str = std::format("NZb:{} NPhB:{} PerVtx:{} DropFail:{} TtklMinPt:{:.2f} MinCl:{}", ZBins, PhiBins, PerPrimaryVertexProcessing, DropTFUponFailure, TrackletMinPt, MinTrackLength);
+  std::string str = std::format("NZb:{} NPhB:{} PerVtx:{} DropFail:{} TtklMinPt:{:.2f} MinCl:{} Steps:{}", ZBins, PhiBins, PerPrimaryVertexProcessing, DropTFUponFailure, TrackletMinPt, MinTrackLength, PassFlags.string());
   auto isSet = [](auto e) { return e >= 0; };
   auto isAnySet = [&isSet](auto v) { return !v.empty() && std::any_of(v.begin(), v.end(), isSet); };
   bool first = true;
@@ -59,6 +59,9 @@ std::string TrackingParameters::asString() const
   if (MaxHoles) {
     str += std::format(" MaxHoles:{} HoleMask:{}", MaxHoles, HoleLayerMask.asString());
   }
+  if (PassFlags[IterationStep::UseDiamond]) {
+    str += " using diamond constraint ";
+  }
   if (std::numeric_limits<size_t>::max() != MaxMemory) {
     str += std::format(" MemLimit {:.2f} GB", double(MaxMemory) / constants::GB);
   }
@@ -125,7 +128,7 @@ std::vector<TrackingParameters> TrackingMode::getTrackingParameters(TrackingMode
   std::vector<TrackingParameters> trackParams;
 
   if (mode == TrackingMode::Async) {
-    trackParams.resize(tc.doUPCIteration ? 4 : 3);
+    trackParams.resize(tc.doUPCIteration ? constants::MaxIter : constants::MaxIter - 1);
     trackParams[1].TrackletMinPt = 0.2f;
     trackParams[1].CellDeltaTanLambdaSigma *= 2.;
     trackParams[2].TrackletMinPt = 0.1f;
@@ -164,6 +167,9 @@ std::vector<TrackingParameters> TrackingMode::getTrackingParameters(TrackingMode
             param.MinPt[lslot0] = tc.minPtIterLgt[lslot];
           }
         }
+        if (tc.useDiamond[ip]) {
+          param.PassFlags.set(IterationStep::UseDiamond);
+        }
       }
     }
   } else if (mode == TrackingMode::Sync) {
@@ -253,7 +259,6 @@ std::vector<TrackingParameters> TrackingMode::getTrackingParameters(TrackingMode
     for (int iD{0}; iD < 3; ++iD) {
       p.Diamond[iD] = tc.diamondPos[iD];
     }
-    p.UseDiamond = tc.useDiamond;
   }
 
   if (trackParams.size() > tc.nIterations) {
@@ -274,42 +279,57 @@ std::vector<VertexingParameters> TrackingMode::getVertexingParameters(TrackingMo
   vertParams[1].PassFlags.set(IterationStep::SkipROFsAboveThreshold, IterationStep::MarkVerticesAsUPC);
 
   // global parameters set for every iteration
-  for (auto& p : vertParams) {
+  for (size_t it{0}; it < vertParams.size(); ++it) {
+    auto& p = vertParams[it];
     p.vertPerRofThreshold = vc.vertPerRofThreshold;
     p.SaveTimeBenchmarks = vc.saveTimeBenchmarks;
     p.PrintMemory = vc.printMemory;
     p.MaxMemory = vc.maxMemory;
     p.DropTFUponFailure = vc.dropTFUponFailure;
-    p.NSigmaCut = vc.nSigmaCut;
     p.maxZPositionAllowed = vc.maxZPositionAllowed;
-    p.clusterContributorsCut = vc.clusterContributorsCut;
-    p.suppressLowMultDebris = vc.suppressLowMultDebris;
-    p.seedMemberRadiusTime = vc.seedMemberRadiusTime;
-    p.seedMemberRadiusZ = vc.seedMemberRadiusZ;
     p.phiSpan = vc.phiSpan;
     p.nThreads = vc.nThreads;
     p.ZBins = vc.ZBins;
     p.PhiBins = vc.PhiBins;
     p.useTruthSeeding = vc.useTruthSeeding;
-    p.maxTrackletsPerCluster = vc.maxTrackletsPerCluster;
-    p.zCut = vc.zCut;
-    p.phiCut = vc.phiCut;
-    p.pairCut = vc.pairCut;
-    p.clusterCut = vc.clusterCut;
-    p.coarseZWindow = vc.coarseZWindow;
-    p.seedDedupZCut = vc.seedDedupZCut;
-    p.refitDedupZCut = vc.refitDedupZCut;
-    p.duplicateZCut = vc.duplicateZCut;
-    p.finalSelectionZCut = vc.finalSelectionZCut;
-    p.duplicateDistance2Cut = vc.duplicateDistance2Cut;
-    p.tanLambdaCut = vc.tanLambdaCut;
+
+    // per iter settings
+    p.NSigmaCut = vc.nSigmaCut[it];
+    p.clusterContributorsCut = vc.clusterContributorsCut[it];
+    p.suppressLowMultDebris = vc.suppressLowMultDebris[it];
+    p.seedMemberRadiusTime = vc.seedMemberRadiusTime[it];
+    p.seedMemberRadiusZ = vc.seedMemberRadiusZ[it];
+    p.maxTrackletsPerCluster = vc.maxTrackletsPerCluster[it];
+    p.zCut = vc.zCut[it];
+    p.phiCut = vc.phiCut[it];
+    p.pairCut = vc.pairCut[it];
+    p.clusterCut = vc.clusterCut[it];
+    p.coarseZWindow = vc.coarseZWindow[it];
+    p.seedDedupZCut = vc.seedDedupZCut[it];
+    p.refitDedupZCut = vc.refitDedupZCut[it];
+    p.duplicateZCut = vc.duplicateZCut[it];
+    p.finalSelectionZCut = vc.finalSelectionZCut[it];
+    p.duplicateDistance2Cut = vc.duplicateDistance2Cut[it];
+    p.tanLambdaCut = vc.tanLambdaCut[it];
   }
 
   if (mode == TrackingMode::Async) {
     // relax for UPC iteration
     vertParams[1].phiCut = 0.015f;
     vertParams[1].tanLambdaCut = 0.015f;
     vertParams[1].maxTrackletsPerCluster = 2000;
+    vertParams[1].pairCut = 0.0317563;
+    vertParams[1].clusterCut = 0.6640964;
+    vertParams[1].coarseZWindow = 0.2049018;
+    vertParams[1].seedDedupZCut = 0.0711793;
+    vertParams[1].refitDedupZCut = 0.0680009;
+    vertParams[1].duplicateZCut = 0.1582193;
+    vertParams[1].finalSelectionZCut = 0.1081465;
+    vertParams[1].duplicateDistance2Cut = 0.0117033;
+    vertParams[1].clusterContributorsCut = 2;
+    vertParams[1].seedMemberRadiusZ = 0;
+    vertParams[1].NSigmaCut = 0.032841;
+    vertParams[1].suppressLowMultDebris = 0;
   } else if (mode == TrackingMode::Sync || TrackingMode::Cosmics) {
     vertParams.resize(1);
   } else {

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

@@ -61,7 +61,7 @@ void TrackerTraits<NLayers>::computeLayerTracklets(const int iteration, int iVer
       if (!mTimeFrame->getROFMaskView().isROFEnabled(transition.fromLayer, pivotROF)) {
         return 0;
       }
-      gsl::span<const Vertex> primaryVertices = mTrkParams[iteration].UseDiamond ? diamondSpan : mTimeFrame->getPrimaryVertices(transition.fromLayer, pivotROF);
+      gsl::span<const Vertex> primaryVertices = mTrkParams[iteration].PassFlags[IterationStep::UseDiamond] ? diamondSpan : mTimeFrame->getPrimaryVertices(transition.fromLayer, pivotROF);
       if (primaryVertices.empty()) {
         return 0;
       }
@@ -97,7 +97,7 @@ void TrackerTraits<NLayers>::computeLayerTracklets(const int iteration, int iVer
 
         for (int iV = startVtx; iV < endVtx; ++iV) {
           const auto& pv = primaryVertices[iV];
-          if (!mTimeFrame->getROFVertexLookupTableView().isVertexCompatible(transition.fromLayer, pivotROF, pv)) {
+          if (!mTrkParams[iteration].PassFlags[IterationStep::UseDiamond] && !mTimeFrame->getROFVertexLookupTableView().isVertexCompatible(transition.fromLayer, pivotROF, pv)) {
             continue;
           }
           if (pv.isFlagSet(Vertex::Flags::UPCMode) != mTrkParams[iteration].PassFlags[IterationStep::SelectUPCVertices]) {
@@ -129,7 +129,7 @@ void TrackerTraits<NLayers>::computeLayerTracklets(const int iteration, int iVer
               continue;
             }
             const auto ts = mTimeFrame->getROFOverlapTableView().getTimeStamp(transition.fromLayer, pivotROF, transition.toLayer, targetROF);
-            if (!ts.isCompatible(pv.getTimeStamp())) {
+            if (!mTrkParams[iteration].PassFlags[IterationStep::UseDiamond] && !ts.isCompatible(pv.getTimeStamp())) {
               continue;
             }
             const auto& targetIndexTable = mTimeFrame->getIndexTable(targetROF, transition.toLayer);

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/src/TrackerSpec.cxx

@@ -145,9 +145,9 @@ std::vector<o2::its::TrackingParameters> TrackerDPL::createTrackingParamsFromCon
         params.MaxChi2NDF = paramConfig["MaxChi2NDF"].get<float>();
       }
 
-      if (paramConfig.contains("UseDiamond")) {
-        params.UseDiamond = paramConfig["UseDiamond"].get<bool>();
-      }
+      // if (paramConfig.contains("UseDiamond")) {
+      //   params.UseDiamond = paramConfig["UseDiamond"].get<bool>();
+      // }
       if (paramConfig.contains("AllowSharingFirstCluster")) {
         params.AllowSharingFirstCluster = paramConfig["AllowSharingFirstCluster"].get<bool>();
       }

prodtests/full-system-test/dpl-workflow.sh

@@ -164,7 +164,7 @@ EVE_OPT=" --jsons-folder $EDJSONS_DIR"
 
 # ITS vertexing settings
 if [[ $BEAMTYPE == "pp" || $LIGHTNUCLEI == "1" ]]; then
-  ITS_CONFIG_KEY+="ITSVertexerParam.phiCut=0.4;ITSVertexerParam.tanLambdaCut=0.17;ITSVertexerParam.pairCut=0.0317563;ITSVertexerParam.clusterCut=0.6640964;ITSVertexerParam.coarseZWindow=0.2049018;ITSVertexerParam.seedDedupZCut=0.0711793;ITSVertexerParam.refitDedupZCut=0.0680009;ITSVertexerParam.duplicateZCut=0.1582193;ITSVertexerParam.finalSelectionZCut=0.1081465;ITSVertexerParam.duplicateDistance2Cut=0.0117033;ITSVertexerParam.clusterContributorsCut=2;ITSVertexerParam.seedMemberRadiusZ=0;ITSVertexerParam.nSigmaCut=0.032841;ITSVertexerParam.suppressLowMultDebris=0;"
+  ITS_CONFIG_KEY+="ITSVertexerParam.phiCut[0]=0.4;ITSVertexerParam.tanLambdaCut[0]=0.17;ITSVertexerParam.pairCut[0]=0.0317563;ITSVertexerParam.clusterCut[0]=0.6640964;ITSVertexerParam.coarseZWindow[0]=0.2049018;ITSVertexerParam.seedDedupZCut[0]=0.0711793;ITSVertexerParam.refitDedupZCut[0]=0.0680009;ITSVertexerParam.duplicateZCut[0]=0.1582193;ITSVertexerParam.finalSelectionZCut[0]=0.1081465;ITSVertexerParam.duplicateDistance2Cut[0]=0.0117033;ITSVertexerParam.clusterContributorsCut[0]=2;ITSVertexerParam.seedMemberRadiusZ[0]=0;ITSVertexerParam.nSigmaCut[0]=0.032841;ITSVertexerParam.suppressLowMultDebris[0]=0;"
 fi
 
 if [[ $CTFINPUT != 1 ]]; then