Skip to content
Snippets Groups Projects
Commit ae746b17 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'cbmuons' into 'master' 

Bugfix for combined muon triggers

See merge request !22753
parents f5dc7b22 1507d662
No related branches found
No related tags found
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!22753Bugfix for combined muon triggers
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 12 deletions
Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+ 3
− 2
View file @ ae746b17
...@@ -88,6 +88,7 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#243 ...@@ -88,6 +88,7 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar ID#267444585 TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6 ID#1672162766 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_e5_etcut ID#607406625
TriggerSummaryStep1 7 0 DEBUG +++ HLT_mu6nol1 ID#1250234908 TriggerSummaryStep1 7 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618 TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
...@@ -226,8 +227,8 @@ TrigSignatureMoniMT INFO HLT_j85 ...@@ -226,8 +227,8 @@ TrigSignatureMoniMT INFO HLT_j85
TrigSignatureMoniMT INFO HLT_j85 decisions 0 0 0 0 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 20 20 3 2 2 0 2
TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 3 2 2 0 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 20 20 3 2 1 1 1
TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 2 0 TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 2 1
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 0 0 2 TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2 0 0 TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2 0 0
TrigSignatureMoniMT INFO HLT_mu6fast 20 20 3 0 0 0 3 TrigSignatureMoniMT INFO HLT_mu6fast 20 20 3 0 0 0 3
......
Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
+ 3
− 2
View file @ ae746b17
...@@ -18,14 +18,15 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6 ID#16721627 ...@@ -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_2mu6Comb ID#2762422737
TriggerSummaryStep2 6 0 DEBUG +++ HLT_2mu6 ID#3347104206 TriggerSummaryStep2 6 0 DEBUG +++ HLT_2mu6 ID#3347104206
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6 ID#1672162766 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 10 10 1 1 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6 decisions 2 2 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 10 10 1 1 0 0 1
TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 2 2 0 0 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 10 10 1 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 1 1 1 0 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 10 10 2 2 1 1 1
TrigSignatureMoniMT INFO HLT_mu6 decisions 3 3 4 0 TrigSignatureMoniMT INFO HLT_mu6 decisions 3 3 4 1
TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 2 2 0 0 2 TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 2 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 3 0 0 TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 3 0 0
TrigSignatureMoniMT INFO HLT_mu6fast 10 10 2 0 0 0 2 TrigSignatureMoniMT INFO HLT_mu6fast 10 10 2 0 0 0 2
......
Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
+ 2
− 2
View file @ ae746b17
...@@ -18,8 +18,8 @@ TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 ...@@ -18,8 +18,8 @@ TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0 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 20 20 3 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0 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 20 20 3 2 1 1 1
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 2 0 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 20 20 3 0 0 0 3
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 3 0 0 0 TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 3 0 0 0
TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 4 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 4 0 0 0 0
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+ 2
− 2
View file @ ae746b17
...@@ -202,8 +202,8 @@ def muEFCBAlgSequence(ConfigFlags): ...@@ -202,8 +202,8 @@ def muEFCBAlgSequence(ConfigFlags):
muEFCBRecoSequence, eventAlgs, sequenceOut = muEFCBRecoSequence( efcbViewsMaker.InViewRoIs, "RoI" ) muEFCBRecoSequence, eventAlgs, sequenceOut = muEFCBRecoSequence( efcbViewsMaker.InViewRoIs, "RoI" )
efcbViewsMaker.ViewNodeName = muEFCBRecoSequence.name() efcbViewsMaker.ViewNodeName = muEFCBRecoSequence.name()
muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, muEFCBRecoSequence] )
muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, efcbViewNode] )
return (muonEFCBSequence, efcbViewsMaker, sequenceOut) return (muonEFCBSequence, efcbViewsMaker, sequenceOut)
def muEFCBSequence(): def muEFCBSequence():
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+ 6
− 4
View file @ ae746b17
...@@ -532,8 +532,9 @@ def muEFCBRecoSequence( RoIs, name ): ...@@ -532,8 +532,9 @@ def muEFCBRecoSequence( RoIs, name ):
efAlgs = [] efAlgs = []
muEFCBRecoSequence = parOR("efcbViewNode_"+name) muEFCBRecoSequence = parOR("efcbViewNode_"+name)
#Need ID tracking related objects and MS tracks from previous steps #Need ID tracking related objects and MS tracks from previous steps
ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier") ViewVerifyMS = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier")
ViewVerifyTrk.DataObjects = [( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ] ViewVerifyMS.DataObjects = [( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ]
muEFCBRecoSequence += ViewVerifyMS
eventAlgs=[] eventAlgs=[]
if "FS" in name: if "FS" in name:
#Need to run tracking for full scan chains #Need to run tracking for full scan chains
...@@ -555,8 +556,9 @@ def muEFCBRecoSequence( RoIs, name ): ...@@ -555,8 +556,9 @@ def muEFCBRecoSequence( RoIs, name ):
if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg": if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg":
TrackParticlesName = viewAlg.TrackParticlesName # noqa: F841 TrackParticlesName = viewAlg.TrackParticlesName # noqa: F841
else: 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' ) ] ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBIDViewDataVerifier")
muEFCBRecoSequence += ViewVerifyTrk 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 #Precision Tracking
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment