Skip to content
Snippets Groups Projects
Commit df7ffd7f authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'trigmuoniso' into 'master' 

Add isolated muon trigger to menu

See merge request atlas/athena!23690
parents 8fbf7dc8 6e2214e7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 65 deletions
Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
+ 9
− 9
View file @ df7ffd7f
...@@ -493,24 +493,24 @@ class TrigMuonEFTrackIsolationHypoConfig() : ...@@ -493,24 +493,24 @@ class TrigMuonEFTrackIsolationHypoConfig() :
try: try:
ptcone03 = trigMuonEFTrkIsoThresholds[ isoCut ] ptcone03 = trigMuonEFTrkIsoThresholds[ isoCut ]
self.PtCone02Cut = -1.0 tool.PtCone02Cut = 0.0
self.PtCone03Cut = ptcone03 tool.PtCone03Cut = ptcone03
self.AcceptAll = False tool.AcceptAll = False
if 'MS' in isoCut: if 'MS' in isoCut:
self.RequireCombinedMuon = False tool.RequireCombinedMuon = False
else: else:
self.RequireCombinedMuon = True tool.RequireCombinedMuon = True
self.DoAbsCut = True tool.DoAbsCut = False
if 'var' in isoCut : if 'var' in isoCut :
self.useVarIso = True tool.useVarIso = True
else : else :
self.useVarIso = False tool.useVarIso = False
except LookupError: except LookupError:
if(isoCut=='passthrough') : if(isoCut=='passthrough') :
print 'Setting passthrough' print 'Setting passthrough'
self.AcceptAll = True tool.AcceptAll = True
else: else:
print 'isoCut = ', isoCut print 'isoCut = ', isoCut
raise Exception('TrigMuonEFTrackIsolation Hypo Misconfigured') raise Exception('TrigMuonEFTrackIsolation Hypo Misconfigured')
......
Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.cxx
+ 2
− 1
View file @ df7ffd7f
...@@ -20,6 +20,7 @@ EventViewCreatorAlgorithmWithMuons::EventViewCreatorAlgorithmWithMuons( const st ...@@ -20,6 +20,7 @@ EventViewCreatorAlgorithmWithMuons::EventViewCreatorAlgorithmWithMuons( const st
declareProperty("RoIEtaWidth", m_roiEtaWidth=0.1); declareProperty("RoIEtaWidth", m_roiEtaWidth=0.1);
declareProperty("RoIPhiWidth", m_roiPhiWidth=0.1); declareProperty("RoIPhiWidth", m_roiPhiWidth=0.1);
declareProperty("LinkToParent", m_linkToParent=true);
} }
EventViewCreatorAlgorithmWithMuons::~EventViewCreatorAlgorithmWithMuons() {} EventViewCreatorAlgorithmWithMuons::~EventViewCreatorAlgorithmWithMuons() {}
...@@ -91,7 +92,7 @@ StatusCode EventViewCreatorAlgorithmWithMuons::execute( const EventContext& cont ...@@ -91,7 +92,7 @@ StatusCode EventViewCreatorAlgorithmWithMuons::execute( const EventContext& cont
outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), viewVector->size()-1 ));//adding view to TC outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), viewVector->size()-1 ));//adding view to TC
outputDecision->setObjectLink( "muons", muonELInfo.link ); outputDecision->setObjectLink( "muons", muonELInfo.link );
ATH_MSG_DEBUG( "Adding new view to new decision; storing view in viewVector component " << viewVector->size()-1 ); ATH_MSG_DEBUG( "Adding new view to new decision; storing view in viewVector component " << viewVector->size()-1 );
ATH_CHECK( linkViewToParent( inputDecision, viewVector->back() ) ); if(m_linkToParent) ATH_CHECK( linkViewToParent( inputDecision, viewVector->back() ) );
ATH_CHECK( placeRoIInView( roi, viewVector->back(), contexts.back() ) ); ATH_CHECK( placeRoIInView( roi, viewVector->back(), contexts.back() ) );
ATH_CHECK( placeMuonInView( muon, viewVector->back(), contexts.back() ) ); ATH_CHECK( placeMuonInView( muon, viewVector->back(), contexts.back() ) );
}// loop over previous inputs }// loop over previous inputs
......
Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.h
+ 1
− 0
View file @ df7ffd7f
...@@ -36,6 +36,7 @@ class EventViewCreatorAlgorithmWithMuons : public EventViewCreatorAlgorithm { ...@@ -36,6 +36,7 @@ class EventViewCreatorAlgorithmWithMuons : public EventViewCreatorAlgorithm {
Gaudi::Property< std::string > m_muonsLink {this,"MuonsLink","Unspecified","Name of EL to Muon object linked to the decision"}; Gaudi::Property< std::string > m_muonsLink {this,"MuonsLink","Unspecified","Name of EL to Muon object linked to the decision"};
double m_roiEtaWidth; double m_roiEtaWidth;
double m_roiPhiWidth; double m_roiPhiWidth;
bool m_linkToParent;
}; };
#endif #endif
......
Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
+ 51
− 49
View file @ df7ffd7f
TrigSignatureMoniMT INFO Chains passing step (1st row events & 2nd row decision counts TrigSignatureMoniMT INFO Chains passing step (1st row events & 2nd row decision counts
TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output
TrigSignatureMoniMT INFO All 20 20 0 0 0 0 20 TrigSignatureMoniMT INFO All 20 20 0 0 0 0 0 20
TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L1MU6 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu6_L1MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L1MU6 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu6_L1MU6 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 20 20 18 0 0 0 18 TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 20 20 18 0 0 0 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 decisions 54 0 0 0 TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 decisions 54 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 0 0 17 TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 0 0 0 17
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 342 0 0 TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 342 0 0 0
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 0 0 16 TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 0 0 0 16
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 329 0 0 TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 329 0 0 0
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 0 0 14 TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 0 0 0 14
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 264 0 0 TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 264 0 0 0
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 20 20 17 17 0 0 17 TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 20 20 17 17 0 0 0 17
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 50 50 0 0 TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 50 50 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split_L1J2020 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j420_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_L1J20 20 20 4 0 0 0 4 TrigSignatureMoniMT INFO HLT_j45_L1J20 20 20 4 0 0 0 0 4
TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 4 0 0 0 TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 4 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 0 0 0 0 TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 2 2 0 2 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 2 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0 TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 2 TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0 TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 1 1 TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 1 1 TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 1 1 0
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 3 0 2 0 2 TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 3 2 1 1 0 0
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 3 0 2 0 TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 3 2 1 1 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 3 0 0 0 3 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 3 0 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 3 0 0 0 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 3 0 2 0 0
TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 4 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 3 0 0 0 0 3
TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 6 0 0 0 TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 3 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 20 20 12 0 0 0 12 TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 4 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 12 0 0 0 TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 5 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 20 20 3 0 0 0 3 TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 20 20 12 0 0 0 0 12
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 decisions 3 0 0 0 TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 12 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 20 20 3 0 0 0 3 TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 20 20 3 0 0 0 0 3
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0 TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 decisions 3 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 20 20 3 0 0 0 0 3
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0 0
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+ 1
− 0
View file @ df7ffd7f
...@@ -42,6 +42,7 @@ def setupMenu(): ...@@ -42,6 +42,7 @@ def setupMenu():
ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_2mu6Comb_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_2mu6Comb_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_2mu6_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_2mu6_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_ivarmedium_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6noL1_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_mu6noL1_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup),
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+ 4
− 2
View file @ df7ffd7f
...@@ -349,14 +349,16 @@ def muEFIsoAlgSequence(ConfigFlags): ...@@ -349,14 +349,16 @@ def muEFIsoAlgSequence(ConfigFlags):
efmuIsoViewsMaker.RoIsLink = "roi" # -||- efmuIsoViewsMaker.RoIsLink = "roi" # -||-
efmuIsoViewsMaker.InViewRoIs = "MUEFIsoRoIs" # contract with the consumer efmuIsoViewsMaker.InViewRoIs = "MUEFIsoRoIs" # contract with the consumer
efmuIsoViewsMaker.Views = "MUEFIsoViewRoIs" efmuIsoViewsMaker.Views = "MUEFIsoViewRoIs"
efmuIsoViewsMaker.InViewMuons = "MuonsIso" efmuIsoViewsMaker.InViewMuons = "IsoViewMuons"
efmuIsoViewsMaker.MuonsLink = "feature" efmuIsoViewsMaker.MuonsLink = "feature"
efmuIsoViewsMaker.RoIEtaWidth=0.15 efmuIsoViewsMaker.RoIEtaWidth=0.15
efmuIsoViewsMaker.RoIPhiWidth=0.15 efmuIsoViewsMaker.RoIPhiWidth=0.15
efmuIsoViewsMaker.LinkToParent=False
### get EF reco sequence ### ### get EF reco sequence ###
from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import efmuisoRecoSequence from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import efmuisoRecoSequence
efmuisoRecoSequence, sequenceOut = efmuisoRecoSequence( efmuIsoViewsMaker.InViewRoIs ) efmuisoRecoSequence, sequenceOut = efmuisoRecoSequence( efmuIsoViewsMaker.InViewRoIs, efmuIsoViewsMaker.InViewMuons )
efmuIsoViewsMaker.ViewNodeName = efmuisoRecoSequence.name() efmuIsoViewsMaker.ViewNodeName = efmuisoRecoSequence.name()
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+ 7
− 4
View file @ df7ffd7f
...@@ -599,7 +599,6 @@ def muEFCBRecoSequence( RoIs, name ): ...@@ -599,7 +599,6 @@ def muEFCBRecoSequence( RoIs, name ):
#Get last tracks from the list as input for other alg #Get last tracks from the list as input for other alg
##Not added to the sequence! Causing stall
PTSeq = seqAND("precisionTrackingInMuons", PTAlgs ) PTSeq = seqAND("precisionTrackingInMuons", PTAlgs )
muEFCBRecoSequence += PTSeq muEFCBRecoSequence += PTSeq
...@@ -683,9 +682,9 @@ def muEFCBRecoSequence( RoIs, name ): ...@@ -683,9 +682,9 @@ def muEFCBRecoSequence( RoIs, name ):
return muEFCBRecoSequence, eventAlgs, sequenceOut return muEFCBRecoSequence, eventAlgs, sequenceOut
def efmuisoRecoSequence( RoIs ): def efmuisoRecoSequence( RoIs, Muons ):
from AthenaCommon.CFElements import parOR from AthenaCommon.CFElements import parOR, seqAND
efmuisoRecoSequence = parOR("efmuIsoViewNode") efmuisoRecoSequence = parOR("efmuIsoViewNode")
...@@ -713,12 +712,16 @@ def efmuisoRecoSequence( RoIs ): ...@@ -713,12 +712,16 @@ def efmuisoRecoSequence( RoIs ):
from TrigUpgradeTest.InDetPT import makeInDetPrecisionTracking from TrigUpgradeTest.InDetPT import makeInDetPrecisionTracking
PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonsIso") PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonsIso")
PTSeq = seqAND("precisionTrackingInMuonsIso", PTAlgs )
efmuisoRecoSequence += PTSeq
# set up algs # set up algs
from TrigMuonEF.TrigMuonEFConfig import TrigMuonEFTrackIsolationMTConfig from TrigMuonEF.TrigMuonEFConfig import TrigMuonEFTrackIsolationMTConfig
trigEFmuIso = TrigMuonEFTrackIsolationMTConfig("TrigEFMuIso") trigEFmuIso = TrigMuonEFTrackIsolationMTConfig("TrigEFMuIso")
trigEFmuIso.MuonEFContainer = muEFCBInfo trigEFmuIso.MuonEFContainer = Muons
trackParticles = PTTrackParticles[-1] trackParticles = PTTrackParticles[-1]
trigEFmuIso.IdTrackParticles = trackParticles trigEFmuIso.IdTrackParticles = trackParticles
trigEFmuIso.MuonContName = "MuonsIso"
efmuisoRecoSequence += trigEFmuIso efmuisoRecoSequence += trigEFmuIso
......
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