Merge branch 'NoPixelForLRT' into 'main'

always do acts clusters and disable pixel for sp and seed for LRT

See merge request !71702

Tracking/Acts/ActsConfig/python/ActsClusterizationConfig.py

@@ -277,11 +277,6 @@ def ActsClusterizationCfg(flags) -> ComponentAccumulator:
     processPixels = flags.Detector.EnableITkPixel
     processStrips = flags.Detector.EnableITkStrip
 
-    # For conversion pass we do not process pixels since we assume
-    # they have been processed on the primary pass.
-    if flags.Tracking.ActiveConfig.extension == "ActsConversion":
-        processPixels = False
-
     kwargs = dict()
     kwargs.setdefault('processPixels', processPixels)
     kwargs.setdefault('processStrips', processStrips)

Tracking/Acts/ActsConfig/python/ActsSeedingConfig.py

@@ -334,7 +334,7 @@ def ActsSeedingCfg(flags) -> ComponentAccumulator:
     processStrips = flags.Detector.EnableITkStrip
 
     # For conversion pass we do not process pixels
-    if flags.Tracking.ActiveConfig.extension == "ActsConversion":
+    if flags.Tracking.ActiveConfig.extension in ["ActsConversion", "ActsLargeRadius"]:
         processPixels = False
     # For main pass disable strips if fast tracking configuration
     elif flags.Tracking.doITkFastTracking:

Tracking/Acts/ActsConfig/python/ActsSpacePointFormationConfig.py

@@ -238,9 +238,9 @@ def ActsSpacePointFormationCfg(flags) -> ComponentAccumulator:
     processPixels = flags.Detector.EnableITkPixel
     processStrips = flags.Detector.EnableITkStrip
 
-    # For conversion pass we do not process pixels since we assume
+    # For conversion and LRT pass we do not process pixels since we assume
     # they have been processed on the primary pass.
-    if flags.Tracking.ActiveConfig.extension == "ActsConversion":
+    if flags.Tracking.ActiveConfig.extension in ["ActsConversion", "ActsLargeRadius"]:
         processPixels = False
     elif flags.Tracking.doITkFastTracking:
         # Fast tracking configuration: disable strip

Tracking/Acts/ActsConfig/python/ActsTrackFindingConfig.py

@@ -160,16 +160,20 @@ def ActsTrackFindingCfg(flags,
     acc = ComponentAccumulator()
 
     kwargs.setdefault('ACTSTracksLocation', f"{flags.Tracking.ActiveConfig.extension}Tracks")
-    if flags.Tracking.ActiveConfig.extension == "ActsConversion":
-        kwargs.setdefault('SeedLabels', isdet(flags, strip=["SSS"]))
-        kwargs.setdefault('EstimatedTrackParametersKeys', isdet(flags, strip=["ActsConversionStripEstimatedTrackParams"]))
-        kwargs.setdefault('SeedContainerKeys', isdet(flags, strip=["ActsConversionStripSeeds"]))
-        kwargs.setdefault('UncalibratedMeasurementContainerKeys', isdet(flags, pixel=["ITkPixelClusters_Cached"], strip=["ITkConversionStripClusters_Cached"]) if flags.Acts.useCache else isdet(flags, pixel=["ITkPixelClusters"], strip=["ITkConversionStripClusters"]))
-    elif flags.Tracking.ActiveConfig.extension == "ActsLargeRadius":
-        kwargs.setdefault('SeedLabels', isdet(flags, pixel=["PPP"], strip=["SSS"]) if not flags.Tracking.doITkFastTracking else isdet(flags, pixel=["PPP"]))
-        kwargs.setdefault('EstimatedTrackParametersKeys', isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelEstimatedTrackParams"], strip=[f"{flags.Tracking.ActiveConfig.extension}StripEstimatedTrackParams"]) if not flags.Tracking.doITkFastTracking else isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelEstimatedTrackParams"]))
-        kwargs.setdefault('SeedContainerKeys', isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelSeeds"], strip=[f"{flags.Tracking.ActiveConfig.extension}StripSeeds"]) if not flags.Tracking.doITkFastTracking else isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelSeeds"]))
-        kwargs.setdefault('UncalibratedMeasurementContainerKeys', isdet(flags, pixel=["ITkLargeRadiusPixelClusters_Cached"], strip=["ITkLargeRadiusStripClusters_Cached"]) if flags.Acts.useCache else isdet(flags, pixel=["ITkLargeRadiusPixelClusters"], strip=["ITkLargeRadiusStripClusters"]))
+    if flags.Tracking.ActiveConfig.extension in ["ActsConversion", "ActsLargeRadius"]:
+        dataPrepPrefix = f'ITk{flags.Tracking.ActiveConfig.extension.replace("Acts", "")}'
+        kwargs.setdefault('SeedLabels', isdet(flags,
+                                              strip=["SSS"]))
+        kwargs.setdefault('EstimatedTrackParametersKeys', isdet(flags,
+                                                                strip=[f"{flags.Tracking.ActiveConfig.extension}StripEstimatedTrackParams"]))
+        kwargs.setdefault('SeedContainerKeys', isdet(flags,
+                                                     strip=[f"{flags.Tracking.ActiveConfig.extension}StripSeeds"]))
+        kwargs.setdefault('UncalibratedMeasurementContainerKeys', isdet(flags,
+                                                                        pixel=[f'{dataPrepPrefix}PixelClusters_Cached'],
+                                                                        strip=[f'{dataPrepPrefix}StripClusters_Cached']) if flags.Acts.useCache else isdet(flags,
+                                                                                                                                                           pixel=[f'{dataPrepPrefix}PixelClusters'],
+                                                                                                                                                           strip=[f'{dataPrepPrefix}StripClusters']))
+        
     else:
         kwargs.setdefault('SeedLabels', isdet(flags, pixel=["PPP"], strip=["SSS"]) if not flags.Tracking.doITkFastTracking else isdet(flags, pixel=["PPP"]))
         kwargs.setdefault('EstimatedTrackParametersKeys', isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelEstimatedTrackParams"], strip=[f"{flags.Tracking.ActiveConfig.extension}StripEstimatedTrackParams"]) if not flags.Tracking.doITkFastTracking else isdet(flags, pixel=[f"{flags.Tracking.ActiveConfig.extension}PixelEstimatedTrackParams"]))