Merge branch 'ActsSpotOnlyActs' into 'main'

Only use ACTS in SPOT workflow

See merge request !71336

InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py

@@ -21,8 +21,7 @@ def CombinedTrackingPassFlagSets(flags):
         TrackingComponent.ActsValidateSpacePoints : "ActsValidateSpacePoints",
         TrackingComponent.ActsValidateSeeds : "ActsValidateSeeds",
         TrackingComponent.ActsValidateTracks : "ActsValidateTracks",
-        TrackingComponent.ActsValidateAmbiguityResolution : "ActsValidateAmbiguityResolution",
-        TrackingComponent.BenchmarkSpot : "ActsBenchmarkSpot"
+        TrackingComponent.ActsValidateAmbiguityResolution : "ActsValidateAmbiguityResolution"
     }
     
     # Athena Pass

Tracking/Acts/ActsConfig/python/ActsCIFlags.py

@@ -7,7 +7,6 @@ def actsAloneWorkflowFlags(flags) -> None:
     """flags for Reco_tf with CA used in unit test: schedule a pure ACTS workflow to reco sequence"""
     flags.Reco.EnableHGTDExtension = False
     flags.Acts.doAmbiguityResolution = True
-    from TrkConfig.TrkConfigFlags import TrackingComponent
     flags.Tracking.recoChain = [TrackingComponent.ActsChain]
     
 def actsHeavyIonFlags(flags) -> None:
@@ -68,7 +67,3 @@ def actsValidateGSFFlags(flags) -> None:
     """flags for Reco_tf with CA used in CI tests: use GaussianSumFitter"""
     from ActsConfig.ActsConfigFlags import TrackFitterType
     flags.Acts.trackFitterType = TrackFitterType.GaussianSumFitter
-
-def actsBenchmarkSpotFlags(flags) -> None:
-    """flags for Reco_tf with CA used for becnkmarking with SPOT"""
-    flags.Tracking.recoChain = [TrackingComponent.BenchmarkSpot]

Tracking/Acts/ActsConfig/python/ActsTrackingPassFlags.py

@@ -142,20 +142,3 @@ def createActsValidateAmbiguityResolutionTrackingPassFlags():
     icf.doActsToAthenaResolvedTrack = True
     return icf
 
-def createActsBenchmarkSpotTrackingPassFlags():
-    icf = createITkTrackingPassFlags()
-    icf.extension = "ActsBenchmarkSpot"
-    deactivateAthenaComponents(icf)
-    # Very not-standard configuration
-    icf.doAthenaCluster = True
-    icf.doActsCluster = True
-    icf.doAthenaToActsCluster = True
-    icf.doActsSpacePoint = True
-    icf.doActsSeed = True
-    icf.doActsTrack = True
-    icf.doActsAmbiguityResolution = True
-    icf.doActsToAthenaResolvedTrack = True
-    return icf
-
-
-    

Tracking/Acts/ActsConfig/share/ActsTrackingComponents.ref

@@ -232,35 +232,6 @@ Tracking.ActiveConfig          points to Tracking.ITkActsValidateAmbiguityResolu
 Tracking.ITkActsValidateAmbiguityResolutionPass points to                        nothing 
 ************************************************************************
 
-************************************************************************
-******************** Tracking reconstruction Config ********************
-                     Active Config is ActsBenchmarkSpot
-Tracking.ActiveConfig.doAthenaAmbiguityResolution : False
-Tracking.ActiveConfig.doAthenaCluster    : True
-Tracking.ActiveConfig.doAthenaSeed       : False
-Tracking.ActiveConfig.doAthenaSpacePoint : False
-Tracking.ActiveConfig.doAthenaToActsCluster : True
-Tracking.ActiveConfig.doAthenaToActsSpacePoint : False
-Tracking.ActiveConfig.doAthenaToActsTrack : False
-Tracking.ActiveConfig.doAthenaTrack      : False
-Flag categories that are redirected by the cloneAndReplace
-Tracking.ActiveConfig          points to Tracking.ITkActsBenchmarkSpotPass 
-Tracking.ITkActsBenchmarkSpotPass points to                        nothing 
-Tracking.ActiveConfig.doActsAmbiguityResolution : True
-Tracking.ActiveConfig.doActsCluster      : True
-Tracking.ActiveConfig.doActsSeed         : True
-Tracking.ActiveConfig.doActsSpacePoint   : True
-Tracking.ActiveConfig.doActsToAthenaCluster : False
-Tracking.ActiveConfig.doActsToAthenaResolvedTrack : True
-Tracking.ActiveConfig.doActsToAthenaSeed : False
-Tracking.ActiveConfig.doActsToAthenaSpacePoint : False
-Tracking.ActiveConfig.doActsToAthenaTrack : False
-Tracking.ActiveConfig.doActsTrack        : True
-Flag categories that are redirected by the cloneAndReplace
-Tracking.ActiveConfig          points to Tracking.ITkActsBenchmarkSpotPass 
-Tracking.ITkActsBenchmarkSpotPass points to                        nothing 
-************************************************************************
-
 ************************************************************************
 ******************** Tracking reconstruction Config ********************
                      Active Config is ActsValidateResolvedTracks

Tracking/Acts/ActsConfig/test/ActsBenchmarkWithSpot.sh

@@ -19,10 +19,10 @@ ATHENA_CORE_NUMBER=${NTHREADS} Reco_tf.py \
     --conditionsTag 'all:OFLCOND-MC15c-SDR-14-05' \
     --geometryVersion 'all:ATLAS-P2-RUN4-03-00-00' \
     --postInclude 'all:PyJobTransforms.UseFrontier' \
-    --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsBenchmarkSpotFlags" \
+    --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsAloneWorkflowFlags" \
     --steering 'doRAWtoALL' \
     --preExec 'all:ConfigFlags.Tracking.doITkFastTracking=False' \
-    --postExec 'all:cfg.getService("AlgResourcePool").CountAlgorithmInstanceMisses = True;cfg.getEventAlgo("ActsBenchmarkSpotPixelClusterizationAlg").ClustersKey="xAODpixelClusters";cfg.getEventAlgo("ActsBenchmarkSpotStripClusterizationAlg").ClustersKey="xAODstripClusters";' \
+    --postExec 'all:cfg.getService("AlgResourcePool").CountAlgorithmInstanceMisses = True;' \
     --inputRDOFile ${DATADIR}"/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/*" \
     --outputAODFile 'myAOD.pool.root' \
     --jobNumber '1' \

Tracking/Acts/ActsConfig/test/ActsTrackingComponents.py

@@ -27,8 +27,7 @@ if __name__ == "__main__":
                       "ActsValidateSpacePoints",
                       "ActsValidateSeeds",
                       "ActsValidateTracks",
-                      "ActsValidateAmbiguityResolution",
-                      "ActsBenchmarkSpot"]
+                      "ActsValidateAmbiguityResolution"]
 
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     flags = initConfigFlags()

Tracking/TrkConfig/python/TrkConfigFlags.py

@@ -51,8 +51,6 @@ class TrackingComponent(FlagEnum):
     ActsValidateSeeds = "ActsValidateSeeds"
     ActsValidateTracks = "ActsValidateTracks"
     ActsValidateAmbiguityResolution = "ActsValidateAmbiguityResolution"
-    # Benchmarking
-    BenchmarkSpot = "BenchmarkSpot"
     # GNN
     GNNChain = "GNNChain"
 
@@ -516,7 +514,6 @@ def createTrackingConfigFlags():
         createActsValidateSeedsTrackingPassFlags,
         createActsValidateTracksTrackingPassFlags,
         createActsValidateAmbiguityResolutionTrackingPassFlags,
-        createActsBenchmarkSpotTrackingPassFlags,
         createActsHeavyIonTrackingPassFlags
     )
 
@@ -534,8 +531,6 @@ def createTrackingConfigFlags():
                           createActsValidateTracksTrackingPassFlags, prefix=True)
     icf.addFlagsCategory ("Tracking.ITkActsValidateAmbiguityResolutionPass",
                           createActsValidateAmbiguityResolutionTrackingPassFlags, prefix=True)
-    icf.addFlagsCategory ("Tracking.ITkActsBenchmarkSpotPass",
-                          createActsBenchmarkSpotTrackingPassFlags, prefix=True)
     icf.addFlagsCategory ("Tracking.ITkActsHeavyIonPass",
                           createActsHeavyIonTrackingPassFlags, prefix=True)