diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 08b428a6f132712824a6ff31da56945cdf4185b7..2b8f9060f0f5de4b2e5d938a04c7269cc5308029 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -88,6 +88,7 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6 ID#1672162766
+TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 7 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -226,8 +227,8 @@ TrigSignatureMoniMT INFO HLT_j85
TrigSignatureMoniMT INFO HLT_j85 decisions 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar 20 20 3 2 2 0 2
TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 3 2 2 0
-TrigSignatureMoniMT INFO HLT_mu6 20 20 3 2 1 0 0
-TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 2 0
+TrigSignatureMoniMT INFO HLT_mu6 20 20 3 2 1 1 1
+TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 2 1
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2 0 0
TrigSignatureMoniMT INFO HLT_mu6fast 20 20 3 0 0 0 3
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
index 6e46b1d1387d63ae4753bfd09f1b96d111f42ce5..cd17daad71d97b319d226a9f84059d31d8878267 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
@@ -18,14 +18,15 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6 ID#16721627
TriggerSummaryStep2 6 0 DEBUG +++ HLT_2mu6Comb ID#2762422737
TriggerSummaryStep2 6 0 DEBUG +++ HLT_2mu6 ID#3347104206
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6 ID#1672162766
+TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6 ID#1672162766
TrigSignatureMoniMT INFO HLT_2mu6 10 10 1 1 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6 decisions 2 2 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb 10 10 1 1 0 0 1
TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 2 2 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar 10 10 1 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 1 1 1 0
-TrigSignatureMoniMT INFO HLT_mu6 10 10 2 2 1 0 0
-TrigSignatureMoniMT INFO HLT_mu6 decisions 3 3 4 0
+TrigSignatureMoniMT INFO HLT_mu6 10 10 2 2 1 1 1
+TrigSignatureMoniMT INFO HLT_mu6 decisions 3 3 4 1
TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 2 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 3 0 0
TrigSignatureMoniMT INFO HLT_mu6fast 10 10 2 0 0 0 2
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
index 3d4b4067f1859857366c4431c45ce63fe2f980f9..dc62b006987fda5daf53d3d7e88065ae894e6ba7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
@@ -18,8 +18,8 @@ TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 0 0
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 2 0
+TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 1 1
+TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 2 1
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 3 0 0 0 3
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 3 0 0 0
TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 4 0 0 0 0
@@ -27,4 +27,4 @@ TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisi
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 20 20 12 0 0 0 12
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 12 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 20 20 3 0 0 0 3
-TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0
\ No newline at end of file
+TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
index 9794c9dd3ba8372f0c03fe0376170aa5ce3b5c43..5ae1b83ef344950a9dee433d844300f1f76ede9d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
@@ -202,8 +202,8 @@ def muEFCBAlgSequence(ConfigFlags):
muEFCBRecoSequence, eventAlgs, sequenceOut = muEFCBRecoSequence( efcbViewsMaker.InViewRoIs, "RoI" )
efcbViewsMaker.ViewNodeName = muEFCBRecoSequence.name()
-
- muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, efcbViewNode] )
+ muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, muEFCBRecoSequence] )
+
return (muonEFCBSequence, efcbViewsMaker, sequenceOut)
def muEFCBSequence():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index 0ce7cdcf5c3eb9be19dfad9cf007d71cd618db98..5f23a844142ca9c6a270acf3f44c9aab894b0c73 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -423,7 +423,6 @@ def muEFSARecoSequence( RoIs, name ):
ServiceMgr += Trk__TrackingVolumesSvc("TrackingVolumesSvc",BuildVolumesFromTagInfo = False)
theSegmentFinder = CfgGetter.getPublicToolClone("MuonSegmentFinder","MooSegmentFinder")
- theSegmentFinder.DoSummary=True
CfgGetter.getPublicTool("MuonLayerHoughTool").DoTruth=False
theSegmentFinderAlg=CfgMgr.MooSegmentFinderAlg( "MuonSegmentMaker_"+name,
SegmentFinder=theSegmentFinder,
@@ -462,8 +461,6 @@ def muEFSARecoSequence( RoIs, name ):
# doTGCClust = False,
# doRPCClust = False)
- from MuonRecExample.MuonStandalone import MuonTrackSteering
- MuonTrackSteering.DoSummary=True
TrackBuilder = CfgMgr.MuPatTrackBuilder("MuPatTrackBuilder" )
TrackBuilder.TrackSteering=CfgGetter.getPublicToolClone("TrigMuonTrackSteering", "MuonTrackSteering")
@@ -535,8 +532,9 @@ def muEFCBRecoSequence( RoIs, name ):
efAlgs = []
muEFCBRecoSequence = parOR("efcbViewNode_"+name)
#Need ID tracking related objects and MS tracks from previous steps
- ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier")
- ViewVerifyTrk.DataObjects = [( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ]
+ ViewVerifyMS = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier")
+ ViewVerifyMS.DataObjects = [( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ]
+ muEFCBRecoSequence += ViewVerifyMS
eventAlgs=[]
if "FS" in name:
#Need to run tracking for full scan chains
@@ -558,8 +556,9 @@ def muEFCBRecoSequence( RoIs, name ):
if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg":
TrackParticlesName = viewAlg.TrackParticlesName # noqa: F841
else:
- ViewVerifyTrk.DataObjects += [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+xAODTracks' ),( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ), ( 'InDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ), ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),( 'xAOD::IParticleContainer' , 'StoreGateSvc+xAODTracks' ),( 'SCT_ByteStreamFractionContainer' , 'StoreGateSvc+SCT_ByteStreamFrac' ) ]
- muEFCBRecoSequence += ViewVerifyTrk
+ ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBIDViewDataVerifier")
+ ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+xAODTracks' ),( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ), ( 'InDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ), ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),( 'xAOD::IParticleContainer' , 'StoreGateSvc+xAODTracks' ),( 'SCT_ByteStreamFractionContainer' , 'StoreGateSvc+SCT_ByteStreamFrac' ) ]
+ muEFCBRecoSequence += ViewVerifyTrk
#Precision Tracking