diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/share/CodeGenerator_jobOptions.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/share/CodeGenerator_jobOptions.py
index 6458e4ddd4a2370765ce00198be71c0f9f388ba7..8b3aa04e62a9c4a4afab0aef63716e7b4fa387c3 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/share/CodeGenerator_jobOptions.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/share/CodeGenerator_jobOptions.py
@@ -1,4 +1,3 @@
-# $Id: CodeGenerator_jobOptions.py 348546 2011-03-01 15:09:56Z krasznaa $
#
# Define an input file. To know which variables the D3PDObject-s would've
@@ -53,9 +52,6 @@ d3pdalg = D3PDMakerReader.MultiReaderAlg( "ReaderAlg", Directory = "../test",
from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
d3pdalg += EventInfoD3PDObject( 10 )
-from TrigMuonD3PDMaker.TrigMuonD3PD import TrigMuonD3PDObjects
-TrigMuonD3PDObjects( d3pdalg, addNaviInfo = False )
-
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
D3PDMakerFlags.DoTrigger = False
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
index d5846675be352b8bc17b4f5a300d12d814708a13..5dd4489e20c1c1c89a0ddfe7437eabc396efb61f 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
@@ -13,7 +13,6 @@ from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
-#import TrigMuonD3PDMaker
import TruthD3PDMaker
from RecExConfig.RecFlags import rec
@@ -334,266 +333,3 @@ if rec.doTruth():
Target = 'mc_')
-# ############################################################################
-# # Trigger matching
-# ############################################################################
-
-# ############################# Event Filter #################################
-# if D3PDMakerFlags.DoTrigger():
-
-# defineTriggerBits (MuonD3PDObject, 0,
-# ['L1_MU0',
-# 'EF_L1ItemStreamer_L1_MU0',
-# 'EF_mu4',
-# 'L2_mu4',
-# 'L2_mu4_MSonly',
-# 'EF_mu4_MSonly',
-# 'EF_mu6',
-# 'L2_mu6',
-# 'L1_MU6',
-# 'L2_mu6_MSonly',
-# 'EF_mu6_MSonly',
-# 'EF_mu10',
-# 'L2_mu10',
-# 'L1_MU10',
-# 'EF_mu10i_loose',
-# 'L2_mu10i_loose',
-# 'EF_mu13',
-# 'L2_mu13',
-# 'EF_mu20',
-# 'EF_mu20_MSonly',
-# 'L2_mu20',
-# 'L2_mu20_MSonly',
-# 'L1_MU20',
-# 'EF_2mu4',
-# 'L2_2mu4',
-# 'L1_2MU4',
-# 'EF_mu6',
-# 'EF_mu4',
-# 'EF_2mu10',
-# ])
-# defineTriggerBits (MuonD3PDObject, 1,
-# D3PDMakerFlags.MuonL1TrigPattern())
-# defineTriggerBits (MuonD3PDObject, 1,
-# D3PDMakerFlags.MuonL2TrigPattern())
-# defineTriggerBits (MuonD3PDObject, 1,
-# D3PDMakerFlags.MuonEFTrigPattern())
-
-# ###################################################################################
-# # Event filter. Associations to combined muons (EF_muXX / muid type trigger muons)
-# ###################################################################################
-# efcbpattern = 'EF_mu[0-9]*$|EF_mu[0-9]*_tight$'
-# efmepattern = 'EF_mu[0-9]*_MSonly$|EF_mu[0-9]*_MSonly_tight$'
-# efmgpattern = 'EF_mu[0-9]*_MG$|EF_mu[0-9]*_MG_tight$'
-
-# MuonEFCBIndexAssoc = IndexAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# target = 'trig_EF_trigmuonef_',
-# prefix = 'EFCB_',
-# level = 11,
-# blockname = 'EFCBInfoIndex',
-# EFTrigMatchType = "CB",
-# # matched = 'matched',
-# WriteDR = False,
-# ChainPattern = efcbpattern)
-
-
-# MuonEFCBAssoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# EFTrigMatchType = "CB",
-# matched = 'matched',
-# blockname = 'EFCBInfo',
-# level = 1,
-# prefix = 'EFCB_',
-# ChainPattern = efcbpattern)
-
-# CBInfoTrackAssoc = \
-# ContainedVectorMultiAssociation( MuonEFCBAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackAssociationTool,
-# prefix = "", blockname = "EFCBInfoTrackAssoc" )
-# CBInfoTrackAssoc.defineBlock( 0, "CBTrackDetails",
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackFillerTool )
-# CombinedTrackAssoc = \
-# SimpleAssociation( CBInfoTrackAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackCombinedTrackAssociationTool,
-# matched = "hasCB", blockname = "CombinedTrackAssoc", prefix = "" )
-# CombinedTrackAssoc.defineBlock( 1, "CombinedTrackBasics",
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteM = False )
-# CombinedTrackAssoc.defineBlock( 12, "CombinedTrackFitResults1",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveFitResults = True )
-# CombinedTrackAssoc.defineBlock( 13, "CombinedTrackFitResults2",
-# TrigMuonD3PDMaker.TrigMuonEFCbTrackFillerTool,
-# SaveFitResults = True )
-# CombinedTrackAssoc.defineBlock( 13, "CombinedTrackFitDetails1",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveHitInfo = True )
-# CombinedTrackAssoc.defineBlock( 13, "CombinedTrackFitDetails2",
-# TrigMuonD3PDMaker.TrigMuonEFCbTrackFillerTool,
-# SaveHitInfo = True )
-
-
-# ###################################################################################
-# # Event filter. Associations to MuGirl muons (EF_muXX_MG type trigger muons)
-# ###################################################################################
-# MuonEFMGIndexAssoc = IndexAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# target = 'trig_EF_trigmugirl_',
-# prefix = 'EFMG_',
-# level = 11,
-# blockname = 'EFMGInfoIndex',
-# EFTrigMatchType = "MG",
-# # matched = 'matched',
-# WriteDR = False,
-# ChainPattern = efmgpattern) # D3PDMakerFlags.MuonEFTrigPattern())
-
-# MuonEFMGAssoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# EFTrigMatchType = "MG",
-# matched = 'matched',
-# blockname = 'EFMGInfo',
-# level = 1,
-# prefix = 'EFMG_',
-# ChainPattern = efmgpattern) #D3PDMakerFlags.MuonEFTrigPattern())
-
-# MGInfoTrackAssoc = \
-# ContainedVectorMultiAssociation( MuonEFMGAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackAssociationTool,
-# prefix = "", blockname = "EFMGInfoTrackAssoc" )
-# MGInfoTrackAssoc.defineBlock( 0, "MGTrackDetails",
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackFillerTool )
-# # Associate combined TrigMuonEFCbTrack objects to the TrigMuonEFInfoTrack objects:
-# MuGirlTrackAssoc = \
-# SimpleAssociation( MGInfoTrackAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackCombinedTrackAssociationTool,
-# matched = "hasMG", blockname = "MuGirlTrackAssoc", prefix = "" )
-# MuGirlTrackAssoc.defineBlock( 1, "MuGirlTrackBasics",
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteM = False )
-# MuGirlTrackAssoc.defineBlock( 12, "MuGirlTrackFitResults1",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveFitResults = True )
-# MuGirlTrackAssoc.defineBlock( 13, "MuGirlTrackFitResults2",
-# TrigMuonD3PDMaker.TrigMuonEFCbTrackFillerTool,
-# SaveFitResults = True )
-# MuGirlTrackAssoc.defineBlock( 13, "MuGirlTrackFitDetails1",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveHitInfo = True )
-# MuGirlTrackAssoc.defineBlock( 13, "MuGirlTrackFitDetails2",
-# TrigMuonD3PDMaker.TrigMuonEFCbTrackFillerTool,
-# SaveHitInfo = True )
-
-# ###################################################################################
-# # Event filter. Associations to MSonly muons (EF_muXX_MSonly type trigger muons)
-# ###################################################################################
-# MuonEFMEIndexAssoc = IndexAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# target = 'trig_EF_trigmuonef_',
-# prefix = 'EFME_',
-# level = 11,
-# blockname = 'EFMEInfoIndex',
-# EFTrigMatchType = "ME",
-# # matched = 'matched',
-# WriteDR = False,
-# ChainPattern = efmepattern) #D3PDMakerFlags.MuonEFTrigPattern())
-
-# MuonEFMEAssoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonEFInfoTriggerObjectAssociationTool,
-# EFTrigMatchType = "ME",
-# matched = 'matched',
-# blockname = 'EFMEInfo',
-# level = 1,
-# prefix = 'EFME_',
-# ChainPattern = efmepattern) #D3PDMakerFlags.MuonEFTrigPattern())
-
-# MEInfoTrackAssoc = \
-# ContainedVectorMultiAssociation( MuonEFMEAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackAssociationTool,
-# prefix = "", blockname = "EFMEInfoTrackAssoc" )
-# MEInfoTrackAssoc.defineBlock( 0, "METrackDetails",
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackFillerTool )
-# # Associate spectrometer-extrapolated TrigMuonEFTrack objects to the TrigMuonEFInfoTrack objects:
-# ExtrapolatedTrackAssoc = \
-# SimpleAssociation( MEInfoTrackAssoc,
-# TrigMuonD3PDMaker.TrigMuonEFInfoTrackExtrapolatedTrackAssociationTool,
-# matched = "hasME", blockname = "ExtrapolatedTrackAssoc", prefix = "" )
-# ExtrapolatedTrackAssoc.defineBlock( 1, "ExtrapolatedTrackBasics",
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteM = False )
-# ExtrapolatedTrackAssoc.defineBlock( 12, "ExtrapolatedTrackFitResults",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveFitResults = True)
-# ExtrapolatedTrackAssoc.defineBlock( 13, "ExtrapolatedTrackDetails",
-# TrigMuonD3PDMaker.TrigMuonEFTrackFillerTool,
-# SaveHitInfo = True )
-
-
-# ############################# Level Two ######################################
-# MuonL2IndexAssoc = IndexAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonL2TriggerObjectAssociationTool,
-# target = 'trig_L2_combmuonfeature_',
-# prefix = 'L2CB_',
-# level = 11,
-# blockname = 'L2CBInfoIndex',
-# WriteDR = False,
-# ChainPattern = D3PDMakerFlags.MuonL2TrigPattern())
-
-# MuonL2Assoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonL2TriggerObjectAssociationTool,
-# level = 1,
-# matched = 'matched',
-# blockname = 'L2CBInfo',
-# prefix = 'L2CB_',
-# ChainPattern = D3PDMakerFlags.MuonL2TrigPattern())
-# MuonL2Assoc.defineBlock (1, 'L2CBKinematics',
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteM = False)
-# MuonL2Assoc.defineBlock (1, 'L2CBDetail1',
-# MuonD3PDMaker.L2MuonCB1FillerTool)
-# MuonL2Assoc.defineBlock (2, 'L2CBDetail2',
-# MuonD3PDMaker.L2MuonCB2FillerTool)
-
-# ############################# Level One ######################################
-# MuonL1IndexAssoc = IndexAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonL1TriggerObjectAssociationTool,
-# target = 'trig_L1_mu_',
-# prefix = 'L1_',
-# level = 11,
-# MaxDR = 0.5,
-# blockname = 'L1InfoIndex',
-# WriteDR = False,
-# ChainPattern = D3PDMakerFlags.MuonL1TrigPattern())
-
-# MuonL1Assoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonL1TriggerObjectAssociationTool,
-# level = 1,
-# matched = 'matched',
-# blockname = 'L1Info',
-# MaxDR = 0.5,
-# prefix = 'L1_',
-# ChainPattern = D3PDMakerFlags.MuonL1TrigPattern())
-# MuonL1Assoc.defineBlock (1, 'L1Kinematics',
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteM = False)
-# MuonL1Assoc.defineBlock (2, 'L1Detail2',
-# TriggerD3PDMaker.Muon_ROIFillerTool,
-# WriteDecodedInfo = True)
-
-
-# MuonIDOrPTPAssoc = SimpleAssociation \
-# (MuonD3PDObject,
-# MuonD3PDMaker.MuonTrackParticleAssociationTool,
-# blockname = 'TrkInfoInDetOrPrimary',
-# Type = 'InDetOrPrimary')
-