Merge branch '23.0-migrate-ftf-sequence-to-ca' into '23.0'

23.0 migrate ftf sequence to ca

See merge request !64757

Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoConfig.py

@@ -53,7 +53,7 @@ def tauTrackBDTRoiUpdaterCfg(flags, inputRoIs, tracks):
 @AccumulatorCache
 def tauLRTRoiUpdaterCfg(flags, inputRoIs, tracks):
     acc                               = ComponentAccumulator()
-    newflags = flags.Trigger.InDetTracking.tauLRT
+    newflags = flags.Tracking.ActiveConfig
     alg                               = CompFactory.TrigTauTrackRoiUpdater("TrackRoiUpdaterLRT",
                                         etaHalfWidth                  = newflags.etaHalfWidth,
                                         phiHalfWidth                  = newflags.phiHalfWidth,

Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py

@@ -733,7 +733,8 @@ TriggerHLTListRun3 = [
     ('xAOD::TrackParticleContainer#HLT_IDTrack_TauCore_FTF',                 'BS ESD AODFULL', 'Tau', [InViews('tauFastTrackCoreViews')]),
     ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_TauCore_FTFAux.',          'BS ESD AODFULL', 'Tau'),
 
-    ('xAOD::TrackParticleContainer#HLT_IDTrack_TauLRT_FTF',                 'BS ESD AODFULL', 'Tau', [InViews('TAUFTFLRTViews')]),
+    ('xAOD::TrackParticleContainer#HLT_IDTrack_TauLRT_FTF',                 'BS ESD AODFULL', 'Tau', [InViews('tauFastTrackLRTViews')]),
+
     ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_TauLRT_FTFAux.',          'BS ESD AODFULL', 'Tau'),
 
     ('xAOD::TrackParticleContainer#HLT_IDTrack_TauIso_FTF',                 'BS ESD AODFULL', 'Tau', [InViews('FastTauIsoViews'), InViews('TAUFTFIsoBDTViews')]),

Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauChainConfiguration.py

@@ -13,10 +13,10 @@ from TriggerMenuMT.HLT.Config.ChainConfigurationBase import ChainConfigurationBa
 from AthenaConfiguration.ComponentFactory import isComponentAccumulatorCfg
 from ..Config.MenuComponents import menuSequenceCAToGlobalWrapper
 
-from .generateTau import tauCaloMVAMenuSeq, tauFTFTauCoreSeq, tauFTFTauIsoSeq
+from .generateTau import tauCaloMVAMenuSeq, tauFTFTauCoreSeq, tauFTFTauIsoSeq, tauFTFTauLRTSeq
 
 if not isComponentAccumulatorCfg():
-    from .TauMenuSequences import tauFTFTauLRTSeq, tauTrackTwoMVASeq, tauTrackTwoLLPSeq, tauTrackLRTSeq, tauPrecTrackIsoSeq, tauPrecTrackLRTSeq
+    from .TauMenuSequences import tauTrackTwoMVASeq, tauTrackTwoLLPSeq, tauTrackLRTSeq, tauPrecTrackIsoSeq, tauPrecTrackLRTSeq
 
 #--------------------------------------------------------
 # fragments generating config will be functions in new JO
@@ -34,7 +34,10 @@ def getFTFCoreCfg(flags, is_probe_leg=False):
        return menuSequenceCAToGlobalWrapper(tauFTFTauCoreSeq,flags, is_probe_leg=is_probe_leg)
 
 def getFTFLRTCfg(flags, is_probe_leg=False):
-    return tauFTFTauLRTSeq(flags, is_probe_leg=is_probe_leg)
+    if isComponentAccumulatorCfg():
+       return tauFTFTauLRTSeq(flags, is_probe_leg=is_probe_leg)
+    else:
+       return menuSequenceCAToGlobalWrapper(tauFTFTauLRTSeq,flags, is_probe_leg=is_probe_leg)
 
 def getFTFIsoCfg(flags, is_probe_leg=False):
     if isComponentAccumulatorCfg():

Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py

@@ -59,12 +59,19 @@ def _ftfCoreSeq(flags,name,is_probe_leg=False):
 
     newRoITool   = CompFactory.ViewCreatorFetchFromViewROITool( 
                                 RoisWriteHandleKey = recordable(flags.Tracking.ActiveConfig.roi),
-                                InViewRoIs = 'UpdatedCaloRoI')                                                                                                
+                                InViewRoIs = 'UpdatedCaloRoI')
+
+    if 'LRT' in name:
+       newRoITool.doResize                 = True
+       newRoITool.RoIEtaWidth              = flags.Tracking.ActiveConfig.etaHalfWidth
+       newRoITool.RoIPhiWidth              = flags.Tracking.ActiveConfig.phiHalfWidth
+       newRoITool.RoIZedWidth              = flags.Tracking.ActiveConfig.zedHalfWidth
+                                                                                                
 
     from TrigGenericAlgs.TrigGenericAlgsConfig import ROBPrefetchingAlgCfg_Si
     from TriggerJobOpts.TriggerConfigFlags import ROBPrefetching
 
-    extraPrefetching = ROBPrefetching.TauCoreLargeRoI in flags.Trigger.ROBPrefetchingOptions
+    extraPrefetching = ROBPrefetching.TauCoreLargeRoI in flags.Trigger.ROBPrefetchingOptions and 'Core' in name
     if extraPrefetching:
       # Add extra RoI to prefetch ROBs for the subsequent tauIso step together with ROBs for tauCore
       prefetchRoIUpdater                   = CompFactory.RoiUpdaterTool()