Skip to content
Snippets Groups Projects
Commit 296a5f56 authored by Savanna Shaw's avatar Savanna Shaw
Browse files

Final bug fixes to get muon tests running fine.

parent c5241651
No related branches found
No related tags found
No related merge requests found
...@@ -580,14 +580,14 @@ def muEFCBRecoSequence( RoIs, OutputLevel=INFO ): ...@@ -580,14 +580,14 @@ def muEFCBRecoSequence( RoIs, OutputLevel=INFO ):
from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone
from AthenaCommon import CfgMgr from AthenaCommon import CfgMgr
from AthenaCommon.CFElements import parOR, seqAND, seqOR, stepSeq
efAlgs = []
efAlgs = []
muEFCBRecoSequence = parOR("efcbViewNode")
#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") ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier")
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' ),( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ] 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' ),( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ), ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ), ( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+MuonSpectrometerTrackParticles' ) ]
efcbViewNode += ViewVerifyTrk muEFCBRecoSequence += ViewVerifyTrk
muEFCBRecoSequence += ViewVerify
#Make InDetCandidates #Make InDetCandidates
theIndetCandidateAlg = CfgMgr.MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg",TrackSelector=getPublicTool("MuonCombinedInDetDetailedTrackSelectorTool"),TrackParticleLocation = ["xAODTracks"],ForwardParticleLocation="xAODTracks",OutputLevel=DEBUG) theIndetCandidateAlg = CfgMgr.MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg",TrackSelector=getPublicTool("MuonCombinedInDetDetailedTrackSelectorTool"),TrackParticleLocation = ["xAODTracks"],ForwardParticleLocation="xAODTracks",OutputLevel=DEBUG)
...@@ -635,7 +635,6 @@ def muEFCBRecoSequence( RoIs, OutputLevel=INFO ): ...@@ -635,7 +635,6 @@ def muEFCBRecoSequence( RoIs, OutputLevel=INFO ):
themuoncbcreatoralg.ClusterContainerName="" themuoncbcreatoralg.ClusterContainerName=""
themuoncbcreatoralg.MuonContainerLocation = "CBMuons" themuoncbcreatoralg.MuonContainerLocation = "CBMuons"
themuoncbcreatoralg.SegmentContainerName = "CBSegments" themuoncbcreatoralg.SegmentContainerName = "CBSegments"
themuoncbcreatoralg.CombinedTrackLocation = "CBCombinedMuons"
themuoncbcreatoralg.ExtrapolatedLocation = "CBExtrapolatedMuons" themuoncbcreatoralg.ExtrapolatedLocation = "CBExtrapolatedMuons"
themuoncbcreatoralg.MSOnlyExtrapolatedLocation = "CBMSOnlyExtrapolatedMuons" themuoncbcreatoralg.MSOnlyExtrapolatedLocation = "CBMSOnlyExtrapolatedMuons"
themuoncbcreatoralg.CombinedLocation = "CBCombinedMuon" themuoncbcreatoralg.CombinedLocation = "CBCombinedMuon"
......
...@@ -207,17 +207,14 @@ def muEFCBStep(): ...@@ -207,17 +207,14 @@ def muEFCBStep():
from TrigUpgradeTest.MuonSetup import muEFCBRecoSequence from TrigUpgradeTest.MuonSetup import muEFCBRecoSequence
muEFCBRecoSequence, sequenceOut = muEFCBRecoSequence( efcbViewsMaker.InViewRoIs, OutputLevel=DEBUG ) muEFCBRecoSequence, sequenceOut = muEFCBRecoSequence( efcbViewsMaker.InViewRoIs, OutputLevel=DEBUG )
efsaViewsMaker.ViewNodeName = muEFSARecoSequence.name() efcbViewsMaker.ViewNodeName = muEFCBRecoSequence.name()
# setup EFCB hypo # setup EFCB hypo
from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuonEFCombinerHypoConfig from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuonEFCombinerHypoConfig
trigMuonEFCBHypo = TrigMuonEFCombinerHypoConfig( "TrigMuonEFCombinerHypoAlg" ) trigMuonEFCBHypo = TrigMuonEFCombinerHypoConfig( "TrigMuonEFCombinerHypoAlg" )
trigMuonEFCBHypo.OutputLevel = DEBUG trigMuonEFCBHypo.OutputLevel = DEBUG
print "muEFCBInfo " trigMuonEFCBHypo.MuonDecisions = sequenceOut
print muEFCBInfo
trigMuonEFCBHypo.MuonDecisions = muEFCBInfo
print
muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, efcbViewNode] ) muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, efcbViewNode] )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment