Unclutter the configuration

Author: mpuccio

Detectors/ITSMFT/ITS/workflow-ca/src/ConfigPreflight.cxx

@@ -20,6 +20,7 @@
 #include "CommonUtils/StringUtils.h"
 #include "Framework/Logger.h"
 #include "ITSMFTTracking/TrackingConfigParam.h"
+#include "ITSMFTTracking/ITSTrackingConfigParam.h"
 
 namespace o2::its::ca
 {
@@ -87,7 +88,6 @@ WorkflowOptions readWorkflowOptions(const o2::framework::ConfigContext& context)
   WorkflowOptions result;
   result.mode = o2::itsmft::TrackingMode::fromString(options.get<std::string>("tracking-mode"));
   requireSupportedTrackingModeOrFatal(result.mode);
-  o2::itsmft::TrackingMode::validateCommonCAOptions(o2::detectors::DetID::ITS);
   const auto& params = o2::itsmft::ITSCommonCATrackerParam::Instance();
   result.vertexSource = resolveVertexSource(options.get<std::string>("vertex-source"), params.useDiamond,
                                             o2::its::VertexerParamConfig::Instance().useTruthSeeding);

Detectors/ITSMFT/ITS/workflow-ca/test/testITSCAConfigPreflight.cxx

@@ -29,6 +29,7 @@
 #include "Framework/ParamRetriever.h"
 #include "Framework/ServiceRegistry.h"
 #include "ITSMFTTracking/TrackingConfigParam.h"
+#include "ITSMFTTracking/ITSTrackingConfigParam.h"
 
 using namespace o2::its::ca;
 

Detectors/ITSMFT/MFT/workflow/src/CATrackerSpec.cxx

@@ -258,7 +258,7 @@ void CATrackerDPL::configureROFViews(gsl::span<const o2::itsmft::ROFRecord> rofs
 void CATrackerDPL::initialiseTracking()
 {
   const auto mode = mOptions.mode;
-  const auto& trackerParams = o2::itsmft::tracking::TrackerParamRef<o2::detectors::DetID::MFT>::get();
+  const auto& trackerParams = o2::itsmft::TrackerParamConfig<o2::detectors::DetID::MFT>::Instance();
   auto plan = o2::itsmft::TrackingMode::getTrackingPlan(o2::detectors::DetID::MFT, mode);
   LOGP(info, "MFT CA tracker initialized in {} mode with {} iteration(s)",
        o2::itsmft::TrackingMode::toString(mode), plan.iterations.size());

Detectors/ITSMFT/MFT/workflow/src/CAWorkflowOptions.cxx

@@ -107,7 +107,6 @@ WorkflowOptions readWorkflowOptions(const o2::framework::ConfigContext& context,
     input.tracksToRecords = options.get<bool>("run-tracks2records");
     input.staggering = o2::itsmft::DPLAlpideParamInitializer::isMFTStaggeringEnabled(context);
   }
-  o2::itsmft::TrackingMode::validateCommonCAOptions(o2::detectors::DetID::MFT);
   const auto& params = Param::Instance();
   auto result = resolveWorkflowOptions(input, {params.trackingMode, params.nThreads, MFTTrackingParam::Instance().irFramesOnly});
   for (const auto& diagnostic : result.diagnostics) {

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/Configuration.h

@@ -16,13 +16,9 @@
 #ifndef ALICEO2_ITSMFT_TRACKING_CONFIGURATION_H_
 #define ALICEO2_ITSMFT_TRACKING_CONFIGURATION_H_
 
+#include <cstddef>
 #include <cstdint>
 
-#ifndef GPUCA_GPUCODE
-#include <gsl/span>
-#include "ITSMFTTracking/SurfaceDescriptor.h"
-#endif
-
 #ifndef GPUCA_GPUCODE_DEVICE
 #include <limits>
 #include <string>
@@ -31,13 +27,9 @@
 #endif
 
 #include "CommonUtils/EnumFlags.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsCommonDataFormats/DetID.h"
-#include "GPUCommonMath.h"
-#include "ITSMFTTracking/ITSMFTDetectorDefinitions.h"
 #include "ITSMFTTracking/LayerMask.h"
 #include "ITSMFTTracking/TrackingConfigParam.h"
-#include "ITSMFTTracking/ITSTrackingConfigParam.h"
 
 namespace o2::itsmft
 {
@@ -50,13 +42,6 @@ enum class IterationStep : uint16_t {
   RebuildClusterLUT = 1,
   UseUPCMask = 2,
   SelectUPCVertices = 3,
-  // Reserved for legacy vertexing/follower configurations; the common
-  // tracker does not implement these steps.
-  ResetVertices = 4,
-  SkipROFsAboveThreshold = 5,
-  MarkVerticesAsUPC = 6,
-  TrackFollowerTop = 7,
-  TrackFollowerBot = 8,
 };
 using IterationSteps = o2::utils::EnumFlags<IterationStep>;
 
@@ -80,11 +65,6 @@ struct IterationParameters {
     return SeedingLayers.empty() ? activeLayers : (SeedingLayers & activeLayers);
   }
 
-  tracking::LayerMask getNonSeedingLayerMask() const noexcept
-  {
-    return tracking::LayerMask::span(0, NLayers - 1) & ~getSeedingLayerMask();
-  }
-
   int getNSeedingLayers() const noexcept
   {
     return getSeedingLayerMask().count();
@@ -120,17 +100,13 @@ struct IterationParameters {
   /// Trackleting cuts
   float TrackletMinPt = 0.3f;
   /// Fitter parameters
-  // Common tracking applies nominal descriptor material; NONE disables external providers only.
-  o2::base::PropagatorImpl<float>::MatCorrType CorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrNONE;
   float MaxChi2ClusterAttachment = 60.f;
   float MaxChi2NDF = 30.f;
-  int ReseedIfShorter = 6; // Reseed final fit tracks shorter than this.
   std::vector<float> MinPt = {0.f, 0.f, 0.f, 0.f};
   tracking::LayerMask StartLayerMask = 0x7F;
   bool RepeatRefitOut = false;   // Repeat outward refit using inward refit as a seed.
   bool ShiftRefToCluster = true; // Shift the linearization reference to the cluster after an update.
   bool PerPrimaryVertexProcessing = false;
-  bool DoUPCIteration = false;
   bool CreateArtefactLabels{false};
   // Track-sharing selections.
   bool AllowSharingFirstCluster = false;
@@ -145,10 +121,6 @@ struct IterationParameters {
 // per-iteration configuration.
 struct DetectorParameters {
   std::vector<uint32_t> AddTimeError = {0, 0, 0, 0, 0, 0, 0};
-  std::vector<float> LayerZ{tracking::kITSLookupZHalfExtent.begin(), tracking::kITSLookupZHalfExtent.end()};
-  std::vector<float> LayerColHalfExtent{}; // Legacy PhiZ helper extent (cm); production lookup uses descriptor chartRange.
-  float IndexRowMin{0.f};                  // Reserved legacy bound; production phi lookup starts at 0.
-  float IndexRowMax{0.f};                  // Reserved legacy bound; production phi lookup ends at TwoPI.
   std::vector<float> LayerResolution = {5.e-4f, 5.e-4f, 5.e-4f, 5.e-4f, 5.e-4f, 5.e-4f, 5.e-4f};
   std::vector<float> SystError2Row = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f}; // Systematic row error squared per layer (ALPIDE X).
   std::vector<float> SystError2Col = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f}; // Systematic column error squared per layer (ALPIDE Z).
@@ -159,7 +131,6 @@ struct DetectorParameters {
 // Single-pass host defaults/input bundle. Production plans store detector
 // inputs and execution policy once, separately from the iteration records.
 struct TrackingParameters : IterationParameters, DetectorParameters, TrackingExecutionPolicy {
-  std::string asString() const;
 };
 
 struct TrackingPlan {
@@ -168,70 +139,6 @@ struct TrackingPlan {
   std::vector<IterationParameters> iterations;
 };
 
-#ifndef GPUCA_GPUCODE
-
-inline bool isRecognizedMatCorrType(o2::base::PropagatorF::MatCorrType corrType) noexcept
-{
-  return corrType == o2::base::PropagatorF::MatCorrType::USEMatCorrNONE ||
-         corrType == o2::base::PropagatorF::MatCorrType::USEMatCorrTGeo ||
-         corrType == o2::base::PropagatorF::MatCorrType::USEMatCorrLUT;
-}
-
-struct AttachHitConfigView {
-  tracking::SurfaceCatalogView catalog;
-  o2::base::PropagatorF::MatCorrType corrType{o2::base::PropagatorF::MatCorrType::USEMatCorrNONE};
-
-  bool isValid(size_t expectedLayers) const noexcept
-  {
-    if (catalog.nSurfaces < expectedLayers || !catalog.surfaces || !isRecognizedMatCorrType(corrType)) {
-      return false;
-    }
-    for (size_t layer = 0; layer < expectedLayers; ++layer) {
-      const auto& material = catalog.surfaces[layer].material;
-      if (!o2::gpu::GPUCommonMath::Finite(material.xOverX0) || material.xOverX0 < 0.f ||
-          !o2::gpu::GPUCommonMath::Finite(material.arealDensityGPerCm2) || material.arealDensityGPerCm2 < 0.f) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-inline AttachHitConfigView bindAttachHitConfig(tracking::SurfaceCatalogView catalog,
-                                               const IterationParameters& params) noexcept
-{
-  return {catalog, params.CorrType};
-}
-
-namespace tracking
-{
-
-enum class MaterialCorrectionModeSupport : uint8_t {
-  Supported,
-  Unsupported,
-  InvalidMode,
-  InvalidSurfaceKind
-};
-
-inline MaterialCorrectionModeSupport materialCorrectionModeSupport(
-  SurfaceKind kind, o2::base::PropagatorF::MatCorrType corrType) noexcept
-{
-  if (!isRecognizedMatCorrType(corrType)) {
-    return MaterialCorrectionModeSupport::InvalidMode;
-  }
-  if (kind != SurfaceKind::Cylinder && kind != SurfaceKind::Disk) {
-    return MaterialCorrectionModeSupport::InvalidSurfaceKind;
-  }
-  if (corrType != o2::base::PropagatorF::MatCorrType::USEMatCorrNONE) {
-    return MaterialCorrectionModeSupport::Unsupported;
-  }
-  return MaterialCorrectionModeSupport::Supported;
-}
-
-} // namespace tracking
-
-#endif
-
 /// Reset tracking parameters to detector geometry defaults.
 void resetDetectorDefaults(TrackingParameters& params, o2::detectors::DetID::ID detId);
 
@@ -247,35 +154,10 @@ enum Type : int8_t {
 
 Type fromString(std::string_view str);
 std::string toString(Type mode);
-// Field-independent validation of common-CA public aliases.
-void validateCommonCAOptions(detectors::DetID::ID detId);
 TrackingPlan getTrackingPlan(o2::detectors::DetID::ID detId, Type mode);
 
 } // namespace TrackingMode
 
 } // namespace o2::itsmft
 
-namespace o2::itsmft::tracking
-{
-
-/// Detector-specific entry points for the common CA configuration.
-template <o2::detectors::DetID::ID DetId>
-struct TrackerParamRef;
-
-template <>
-struct TrackerParamRef<o2::detectors::DetID::MFT> {
-  using Type = o2::itsmft::TrackerParamConfig<o2::detectors::DetID::MFT>;
-  static const Type& get() { return Type::Instance(); }
-  static constexpr int nLayers() { return Type::getNLayers(); }
-};
-
-template <>
-struct TrackerParamRef<o2::detectors::DetID::ITS> {
-  using Type = o2::itsmft::ITSCommonCATrackerParam;
-  static const Type& get() { return Type::Instance(); }
-  static constexpr int nLayers() { return ITSNLayers; }
-};
-
-} // namespace o2::itsmft::tracking
-
 #endif /* ALICEO2_ITSMFT_TRACKING_CONFIGURATION_H_ */

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/IndexTableUtils.h

@@ -84,15 +84,6 @@ class IndexTableUtilsCore
                         gsl::span<const float>{maxima.data(), static_cast<size_t>(count)});
   }
 
-  /// Fill LUT geometry from any struct exposing RowBins, ColBins and LayerZ (ITS phi-z).
-  template <class T>
-  void setTrackingParameters(const T& params)
-  {
-    const auto extents = layerColHalfExtentFrom(params);
-    setIndexTableParams(IndexTableCoordType::PhiZ, params.RowBins, params.ColBins,
-                        0.f, o2::constants::math::TwoPI, gsl::span<const float>{extents.data(), static_cast<std::size_t>(extents.count)});
-  }
-
   GPUhdi() float getInverseColCoordinate(const int layerIndex) const
   {
     return mInverseColBinSize[layerIndex];
@@ -139,33 +130,6 @@ class IndexTableUtilsCore
   GPUhdi() float getRowCoordinateSpan() const { return mRowCoordinateSpan; }
 
  private:
-  /// Fixed-capacity result of layerColHalfExtentFrom(); count is the number of
-  /// available entries, never above MaxLayers.
-  struct LayerExtents {
-    std::array<float, MaxLayers> values{};
-    int count{0};
-    const float* data() const noexcept { return values.data(); }
-  };
-
-  template <class T>
-  static LayerExtents layerColHalfExtentFrom(const T& params)
-  {
-    LayerExtents extents;
-    if constexpr (requires { params.LayerColHalfExtent; }) {
-      const auto& colExtents = params.LayerColHalfExtent.empty() ? params.LayerZ : params.LayerColHalfExtent;
-      extents.count = std::min(static_cast<int>(colExtents.size()), MaxLayers);
-      for (int iLayer{0}; iLayer < extents.count; ++iLayer) {
-        extents.values[iLayer] = colExtents[iLayer];
-      }
-    } else {
-      extents.count = std::min(static_cast<int>(params.LayerZ.size()), MaxLayers);
-      for (int iLayer{0}; iLayer < extents.count; ++iLayer) {
-        extents.values[iLayer] = params.LayerZ[iLayer];
-      }
-    }
-    return extents;
-  }
-
   int mNcolBins = 0;
   int mNrowBins = 0;
   float mInverseRowBinSize = 0.f;

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/TrackingConfigParam.h

@@ -14,7 +14,6 @@
 
 #include <array>
 #include <limits>
-#include <string>
 #include <string_view>
 
 #include "CommonUtils/ConfigurableParam.h"
@@ -42,17 +41,14 @@ namespace o2::itsmft
 /// Minimal configuration for opt-in ITS common-CA tracking.
 /// It does not use the registered name "ITSCATrackerParam", which belongs to the
 /// legacy o2::its::TrackerParamConfig.
-/// Implemented workflow controls plus reserved diagnostic aliases; unsupported
-/// overrides are rejected by common-CA option validation. Defaults preserve the detector tracking
+/// Implemented workflow controls. Defaults preserve the detector tracking
 /// baseline for both supported modes.
 ///
 /// diamondPos, pvRes, and useDiamond define the static vertex/beam constraint
 /// consumed by the shared TrackerTraits.
 struct ITSCommonCATrackerParam : public o2::conf::ConfigurableParamHelper<ITSCommonCATrackerParam> {
   bool dropTFUponFailure = false;
-  bool printMemory = false; // Reserved alias: true is rejected (no memory report).
   size_t maxMemory = std::numeric_limits<size_t>::max();
-  bool saveTimeBenchmarks = false; // Reserved alias: true is rejected (no benchmark writer).
   bool useDiamond = false;
   float diamondPos[3] = {0.f, 0.f, 0.f}; // Diamond vertex position when useDiamond is set.
   float pvRes = -1.f;                    // Diamond-vertex PV resolution; <=0 keeps the default.
@@ -80,9 +76,6 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
   static constexpr int MaxTrackLength = tracking::MFTNLayers;
   static constexpr int getNLayers() { return tracking::MFTNLayers; }
 
-  std::string materialModel = "nominal";                                                          // Implemented provider: nominal descriptor material.
-  bool useMatCorrTGeo = false;                                                                    // Legacy alias: true requests unsupported TGeo and is rejected.
-  bool useFastMaterial = true;                                                                    // Legacy alias: true selects nominal; false requests unsupported LUT.
   int addTimeError[getNLayers()] = {0};                                                           // Tracking window width in BC.
   int minTrackLgtIter[o2::itsmft::tracking::MaxIter] = {};                                        // Async minimum track length per iteration; <=0 keeps preset.
   uint32_t startLayerMask[o2::itsmft::tracking::MaxIter] = {};                                    // Per-pass starts; 0 keeps the preset, bits must name detector layers.
@@ -94,29 +87,20 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
   float maxChi2ClusterAttachment = -1.f;
   float maxChi2NDF = -1.f;
   float nSigmaCut = -1.f;
-  float deltaTanLres = -1.f; // Reserved alias: overrides are rejected (no consumer).
   float minPt = -1.f;
   float pvRes = -1.f;
   int LUTbinsU = 64;                       // Radial bins in the MFT PhiR index (radius in cm).
   int LUTbinsV = 128;                      // Phi bins in the MFT PhiR index (angle in radians).
   float diamondPos[3] = {0.f, 0.f, 0.f};   // Diamond vertex for MFT seeds (cm).
-  bool useDiamond = true;                  // Compatibility constraint: MFT requires true.
-  bool perPrimaryVertexProcessing = false; // Compatibility constraint: MFT requires false.
-  bool saveTimeBenchmarks = false;         // Reserved alias: true is rejected (no benchmark writer).
-  bool overrideBeamEstimation = false;     // Reserved alias: true is rejected (no MFT beam estimation).
   int trackingMode = -1;                   // -1: use --tracking-mode; 0: sync, 1: async, 2: cosmics, 3: off.
-  bool doUPCIteration = false;             // Reserved alias: true is rejected (no MFT UPC preset).
   int nIterations = -1;                    // -1 uses all mode preset passes; otherwise a positive limit no larger than the preset.
-  int reseedIfShorter = 6;                 // Reserved while reseeding is developed; currently diagnosed as ineffective.
   bool shiftRefToCluster{true};            // Shift the linearization reference to the cluster after update.
   bool repeatRefitOut{false};              // Repeat outward refit using the inward refit as a seed.
   bool createArtefactLabels{false};        // Create labels for artefacts on the fly.
 
   int nThreads = 1;
-  bool printMemory = false; // Reserved alias: true is rejected (no memory report).
   size_t maxMemory = std::numeric_limits<size_t>::max();
   bool dropTFUponFailure = false;
-  bool fataliseUponFailure = true; // Reserved alias: false is rejected; use dropTFUponFailure.
 
   // Selection of tracks sharing clusters.
   bool allowSharingFirstCluster = false;  // Allow sharing the first cluster.