diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py index 54bfa159446263ddcaace81468fcab97794c9315..ad5d13133484d979bea2d9a1a45d72a02ab78c28 100755 --- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py +++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py @@ -415,6 +415,7 @@ remap = { "FTK" : "FTK", "Muon" : "muon", "MuonFS" : "muon", + "MuonLate" : "muon", "MuonCore" : "muonCore", "MuonIso" : "muonIso", "eGamma" : "electron", @@ -613,6 +614,10 @@ class TrigFastTrackFinder_MuonFS(TrigFastTrackFinderBase): def __init__(self, name = "TrigFastTrackFinder_MuonFS"): TrigFastTrackFinderBase.__init__(self, "TrigFastTrackFinder_MuonFS","Muon") +class TrigFastTrackFinder_MuonLate(TrigFastTrackFinderBase): + def __init__(self, name = "TrigFastTrackFinder_MuonLate"): + TrigFastTrackFinderBase.__init__(self, "TrigFastTrackFinder_MuonLate","Muon") + class TrigFastTrackFinder_MuonIso(TrigFastTrackFinderBase): def __init__(self, name = "TrigFastTrackFinder_MuonIso"): TrigFastTrackFinderBase.__init__(self, "TrigFastTrackFinder_MuonIso","Muon") diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref index 39f93ab845b6e46dfde844e39f2abfa82595888e..d4703ac9523aa229093cf597fb5183ab2d33964b 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref @@ -90,8 +90,8 @@ TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 decisions 14 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j85_L1J20 19 19 13 0 0 0 0 0 13 TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 13 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 10 10 10 10 8 0 0 0 8 -TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 14 14 14 0 0 0 +TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 10 10 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 10 10 10 5 3 0 0 0 3 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 14 6 3 0 0 0 TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 8 8 6 6 6 6 0 0 6 diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref index 7aeaa0008e6f3e4a644cc2f73c85c45b6a4aea0f..a7daf72581bafd82fe0391416449dffba6acf49f 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref @@ -160,7 +160,6 @@ TriggerSummaryStep3 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 TriggerSummaryStep3 4 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep3 4 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep4 4 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 -TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep1 5 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897 @@ -183,7 +182,6 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6fast_L1MU6 I TriggerSummaryStep1 5 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018 TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 TriggerSummaryStep1 5 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 -TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 @@ -200,7 +198,6 @@ TriggerSummaryStep3 5 0 DEBUG +++ HLT_e7_etcut_L1EM3 TriggerSummaryStep3 5 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep3 5 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep4 5 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 -TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897 @@ -227,7 +224,6 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_xe30_mht_L1XE10 TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu50_L1MU20 ID#3657158931 TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 -TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep2 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897 TriggerSummaryStep2 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 @@ -247,7 +243,6 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu26_ivarmedium TriggerSummaryStep2 6 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu50_L1MU20 ID#3657158931 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 -TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897 TriggerSummaryStep3 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 @@ -263,7 +258,6 @@ TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_idperf_L1MU TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062 TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253 TriggerSummaryStep4 6 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 -TriggerSummaryStep1 7 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep1 7 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 @@ -276,7 +270,6 @@ TriggerSummaryStep1 7 0 DEBUG +++ HLT_2e3_etcut_L12EM TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep1 7 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018 TriggerSummaryStep1 7 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 -TriggerSummaryStep2 7 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 @@ -467,7 +460,6 @@ TriggerSummaryStep3 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 TriggerSummaryStep3 14 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 TriggerSummaryStep3 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep4 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 -TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909 @@ -486,7 +478,6 @@ TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6fast_L1MU6 I TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu50_L1MU20 ID#3657158931 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 -TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu10_lateMu_L1MU10 ID#48780310 TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909 TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109 TriggerSummaryStep2 15 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1All ID#843341480 @@ -688,8 +679,8 @@ TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 decisions 1 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 1 0 0 0 0 0 1 TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 1 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 20 20 4 4 1 0 0 0 1 -TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 4 4 1 0 0 0 +TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 20 20 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 1 1 0 0 0 1 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 1 1 0 0 0 TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 20 20 2 2 0 0 0 0 0 diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index d9db425bb996bc58b7a542f6939b8b7e5d90861c..57b095848c18fa92a66ee02bd5d8fd68bcacadc0 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -151,6 +151,9 @@ TriggerHLTListRun3 = [ ('xAOD::TrackParticleContainer#HLT_xAODTracks_MuonIso', 'BS ESD AODFULL', 'Muon', 'inViews:MUEFIsoViewRoIs'), ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_MuonIsoAux.', 'BS ESD AODFULL', 'Muon'), + ('xAOD::TrackParticleContainer#HLT_xAODTracks_MuonLate', 'BS ESD AODFULL', 'Muon', 'inViews:MUEFLATEViewRoIs'), + ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_MuonLateAux.', 'BS ESD AODFULL', 'Muon'), + #bphys ('xAOD::TrigBphysContainer#TrigBphysDimu', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), ('xAOD::TrigBphysAuxContainer#TrigBphysDimuAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 91b3e3ef67011f03e37b5e0e48b8249d7236e759..59c85356cc22ddd6fe002609381d0c8cc1af4e2d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -60,7 +60,7 @@ def setupMenu(): ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_2mu6_10invm70_L1MU6', groups=SingleMuonGroup), - ChainProp(name='HLT_mu10_lateMu_L1MU10', groups=SingleMuonGroup), + ChainProp(name='HLT_mu10_lateMu_L1MU10', l1SeedThresholds=[''], groups=SingleMuonGroup), # ATR-20049 ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=SingleMuonGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py index 5f4c97d80ce71db559659a8be0579db1dbdeacfd..610387e9a1267c6f004f50a3a8d22af5b21b031c 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py @@ -115,7 +115,7 @@ class MuonChainConfiguration(ChainConfigurationBase): "msonly":[[self.getmuFast(), self.getmuMSEmpty(1)], [self.getmuEFMS()]], "ivarmedium":[[self.getmuFast(), self.getmuComb()], [self.getmuEFSA(), self.getmuEFCB(), self.getmuEFIso()]], "invM":[[],[self.getmuInvM()]], - "lateMu":[[self.getmuFast(), self.getmuComb()],[self.getLateMu()]] + "lateMu":[[],[self.getLateMu()]] } return stepDictionary diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py index 0f91b2ce0b50ef8da139f9411b138002d9751ed9..c0a6b6041cce342086628558bbbf7a707380051b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py @@ -103,7 +103,7 @@ def muCombAlgSequence(ConfigFlags): ### get ID tracking and muComb reco sequences ### from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import muCombRecoSequence, muonIDFastTrackingSequence - muFastIDRecoSequence, eventAlgs = muonIDFastTrackingSequence( l2muCombViewsMaker.InViewRoIs,"muComb" ) + muFastIDRecoSequence, eventAlgs = muonIDFastTrackingSequence( l2muCombViewsMaker.InViewRoIs,"") muCombRecoSequence, sequenceOut = muCombRecoSequence( l2muCombViewsMaker.InViewRoIs ) #Filter algorithm to run muComb only if non-Bphysics muon chains are active @@ -407,21 +407,29 @@ def muEFCBFSSequence(): def efLateMuAlgSequence(ConfigFlags): - from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import muEFInsideOutRecoSequence + from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import muEFInsideOutRecoSequence, efLateMuRoISequence, makeMuonPrepDataAlgs, muonIDFastTrackingSequence eflateViewsMaker = EventViewCreatorAlgorithm("IMeflatemu") eflateViewsMaker.ViewFallThrough = True eflateViewsMaker.RoIsLink = "initialRoI" # -||- eflateViewsMaker.InViewRoIs = "MUEFLATERoIs" # contract with the consumer eflateViewsMaker.Views = "MUEFLATEViewRoIs" - eflateViewsMaker.RequireParentView = True + + #Get Late Muon RoIs + efLateMuRoISequence, roiName = efLateMuRoISequence() + #decode data in these RoIs + viewAlgs_MuonPRD = makeMuonPrepDataAlgs(RoIs=roiName) + #ID fast tracking + muFastIDRecoSequence, eventAlgs = muonIDFastTrackingSequence( roiName,"Late" ) #inside-out reco sequence - muonEFInsideOutRecoSequence, sequenceOut = muEFInsideOutRecoSequence( eflateViewsMaker.InViewRoIs, "RoILate") + muonEFInsideOutRecoSequence, sequenceOut = muEFInsideOutRecoSequence( roiName, "LateMu") + + lateMuRecoSequence = parOR("lateMuonRecoSequence", [efLateMuRoISequence, viewAlgs_MuonPRD, muFastIDRecoSequence, muonEFInsideOutRecoSequence]) #Final sequence running in view - eflateViewsMaker.ViewNodeName = muonEFInsideOutRecoSequence.name() - muonSequence = seqAND("lateMuonOutSequence", [eflateViewsMaker, muonEFInsideOutRecoSequence]) + eflateViewsMaker.ViewNodeName = lateMuRecoSequence.name() + muonSequence = seqAND("lateMuonOutSequence", [eflateViewsMaker, lateMuRecoSequence]) return (muonSequence, eflateViewsMaker, sequenceOut) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py index 26a532daa60cc385c529edcfbdd46253db682dff..a3c95c5aacf3c92b3be40de6fff5af57dc80b4f0 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py @@ -56,9 +56,11 @@ muNamesFS = muonNames().getNames('FS') ### ==================== Data prepartion needed for the EF and L2 SA ==================== ### def makeMuonPrepDataAlgs(RoIs="MURoIs", forFullScan=False): - postFix = "" - if forFullScan: - postFix = "FS" + from AthenaCommon.CFElements import parOR + + muDecodeRecoSequence = parOR("decodeMuViewNode_"+RoIs) + + postFix = "_"+RoIs viewAlgs_MuonPRD = [] # These algs should be executed to prepare muon PRDs for muFast and muEF steps. @@ -231,8 +233,8 @@ def makeMuonPrepDataAlgs(RoIs="MURoIs", forFullScan=False): viewAlgs_MuonPRD.append( MuonClusterAlg ) - - return ( viewAlgs_MuonPRD ) + muDecodeRecoSequence += viewAlgs_MuonPRD + return muDecodeRecoSequence def muFastRecoSequence( RoIs ): @@ -316,7 +318,7 @@ def muonIDFastTrackingSequence( RoIs, name ): ### Define input data of Inner Detector algorithms ### ### and Define EventViewNodes to run the algorithms ### from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs - (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature="Muon", rois = RoIs) + (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature="Muon"+name, rois = RoIs) global TrackParticlesName global theFTF_name @@ -706,16 +708,6 @@ def muEFInsideOutRecoSequence(RoIs, name): efmuInsideOutRecoSequence = parOR(viewNodeName) if "Late" in name: - #May be able to do this more nicely in the future to run only if we haven't run this in other chains - #Need PRD containers for inside-out reco - ViewVerifyInsideOut = CfgMgr.AthViews__ViewDataVerifier("muonInsideOutViewDataVerifier") - ViewVerifyInsideOut.DataObjects = [( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), - ( 'Muon::CscPrepDataContainer' , 'StoreGateSvc+CSC_Clusters' ), - ( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), - ( 'Muon::RpcPrepDataContainer' , 'StoreGateSvc+RPC_Measurements' ), - ( 'Muon::TgcPrepDataContainer' , 'StoreGateSvc+TGC_Measurements' )] - - efmuInsideOutRecoSequence += ViewVerifyInsideOut #Need to run hough transform at start of late muon chain from TrkDetDescrSvc.TrkDetDescrSvcConf import Trk__TrackingVolumesSvc @@ -747,18 +739,7 @@ def muEFInsideOutRecoSequence(RoIs, name): efAlgs.append(theSegmentFinderAlg) # need to run precisions tracking for late muons, since we don't run it anywhere else - TrackCollection="TrigFastTrackFinder_Tracks_Muon" - ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("lateMuonIDViewDataVerifier") - - ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+HLT_xAODTracks_Muon' ), - ( 'TrackCollection' , 'StoreGateSvc+'+TrackCollection ), - ( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ), - ( 'xAOD::IParticleContainer' , 'StoreGateSvc+HLT_xAODTracks_Muon' )] - - if globalflags.InputFormat.is_bytestream(): - ViewVerifyTrk.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ) ] - efmuInsideOutRecoSequence += ViewVerifyTrk - + TrackCollection="TrigFastTrackFinder_Tracks_MuonLate" #Precision Tracking PTAlgs = [] #List of precision tracking algs @@ -767,8 +748,8 @@ def muEFInsideOutRecoSequence(RoIs, name): from TrigUpgradeTest.InDetPT import makeInDetPrecisionTracking #When run in a different view than FTF some data dependencies needs to be loaded through verifier - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonsLate", ViewVerifyTrk, inputFTFtracks= TrackCollection ) - PTSeq = seqAND("precisionTrackingInMuons", PTAlgs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonsLate", inputFTFtracks= TrackCollection ) + PTSeq = seqAND("precisionTrackingInLateMuons", PTAlgs ) efmuInsideOutRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] @@ -915,3 +896,18 @@ def efmuisoRecoSequence( RoIs, Muons ): sequenceOut = trigEFmuIso.MuonContName return efmuisoRecoSequence, sequenceOut + + +def efLateMuRoISequence(): + + from AthenaCommon.CFElements import parOR + efLateMuRoISequence = parOR("efLateMuRoIViewNode") + + from TrigmuRoI.TrigmuRoIConfig import TrigmuRoIMT + roiAlg = TrigmuRoIMT("TrigmuRoIMT") + sequenceOut = "LateMuRoIs" + roiAlg.RoisWriteHandleKey=sequenceOut + + efLateMuRoISequence+=roiAlg + + return efLateMuRoISequence, sequenceOut