Merge pull request #14747 from jhgoh/RemoveSETMuonCaloMuon

Disable SETMuon and caloMuon from the standard reconstruction

DQM/DTMonitorModule/python/dtChamberEfficiency_cfi.py

@@ -5,7 +5,7 @@
 dtEfficiencyMonitor = cms.EDAnalyzer("DTChamberEfficiency",
     MuonServiceProxy,
     debug = cms.untracked.bool(True),
-    TrackCollection = cms.InputTag("standAloneSETMuons"),     
+    TrackCollection = cms.InputTag("standAloneMuons"),
     theMaxChi2 = cms.double(1000.),
     theNSigma = cms.double(3.),
     theMinNrec = cms.double(20.),

RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py

@@ -15,9 +15,6 @@
 #hiMuons1stStep.fillGlobalTrackRefits = False
 muonEcalDetIds.inputCollection = "hiMuons1stStep"
 
-calomuons.inputTracks = hiTracks
-calomuons.inputCollection = 'hiMuons1stStep'
-calomuons.inputMuons = 'hiMuons1stStep'
 muIsoDepositTk.inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:tracker"))
 muIsoDepositJets. inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:jets"))
 muIsoDepositCalByAssociatorTowers.inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:ecal"), cms.InputTag("hiMuons1stStep:hcal"), cms.InputTag("hiMuons1stStep:ho"))

RecoHI/HiMuonAlgos/python/HiRegionalRecoMuon_cff.py

@@ -33,11 +33,6 @@
 remuonEcalDetIds.inputCollection                = "remuons"
 
 #muons.fillGlobalTrackRefits = False
-# calomuons
-recalomuons   = calomuons.clone()
-recalomuons.inputTracks          = hiReMuTracks
-recalomuons.inputCollection      = 'remuons'
-recalomuons.inputMuons           = 'remuons'
 
 # deposits
 remuIsoDepositTk = muIsoDepositTk.clone()
@@ -52,7 +47,7 @@
 
 # replace the new names
 
-remuonIdProducerSequence = cms.Sequence(reglbTrackQual*remuons*recalomuons*remuonEcalDetIds*remuonShowerInformation)
+remuonIdProducerSequence = cms.Sequence(reglbTrackQual*remuons*remuonEcalDetIds*remuonShowerInformation)
 remuIsoDeposits_muons    = cms.Sequence(remuIsoDepositTk+remuIsoDepositCalByAssociatorTowers+remuIsoDepositJets)
 remuIsolation_muons      = cms.Sequence(remuIsoDeposits_muons)
 remuIsolation            = cms.Sequence(remuIsolation_muons)

RecoMuon/Configuration/python/RecoMuonCosmics_EventContent_cff.py

@@ -18,7 +18,6 @@
     'keep recoTracksToOnerecoTracksAssociation_tevMuons_*_*',
     'keep recoMuons_muons_*_*',
     'keep recoMuonTimeExtraedmValueMap_muons_*_*',
-    'keep recoCaloMuons_calomuons_*_*',
 
     # Split tracks
     'keep recoTracks_globalCosmicSplitMuons_*_*', 

RecoMuon/Configuration/python/RecoMuonCosmics_cff.py

@@ -40,11 +40,6 @@
 muonsFromCosmics.fillGlobalTrackQuality = False
 muonsFromCosmics.fillGlobalTrackRefits = False
 
-from RecoMuon.MuonIdentification.calomuons_cfi import *
-calomuons.inputTracks = 'ctfWithMaterialTracksP5LHCNavigation'
-calomuons.inputCollection = 'muons'
-calomuons.inputMuons = 'muons'
-
 ## Sequences
 
 # Stand Alone Tracking
@@ -75,7 +70,7 @@
 glbTrackQual.InputCollection = "globalCosmicMuons"
 
 # all muons id
-allmuons = cms.Sequence(glbTrackQual*tevMuons*muons*muIsolation*calomuons)
+allmuons = cms.Sequence(glbTrackQual*tevMuons*muons*muIsolation)
 
 # Final sequence
 muonrecoforcosmics = cms.Sequence(muontrackingforcosmics*allmuons*muonsFromCosmics)

RecoMuon/Configuration/python/RecoMuonPPonly_cff.py

@@ -58,9 +58,8 @@
 
 # Muon Reconstruction plus Isolation
 muonreco_plus_isolation = cms.Sequence(muonreco*muIsolation)
-muonreco_plus_isolation_plus_SET = cms.Sequence(muonreco_plus_isolation*muonreco_with_SET)
 
-muonrecoComplete = cms.Sequence(muonreco_plus_isolation_plus_SET*muonSelectionTypeSequence)
+muonrecoComplete = cms.Sequence(muonreco_plus_isolation*muonSelectionTypeSequence)
 
 
 # _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- #
@@ -72,7 +71,7 @@
 
 #from RecoMuon.MuonIdentification.earlyMuons_cfi import earlyMuons
 
-muonGlobalReco = cms.Sequence(globalmuontracking*muonIdProducerSequence*muonSelectionTypeSequence*muIsolation*muonreco_with_SET)
+muonGlobalReco = cms.Sequence(globalmuontracking*muonIdProducerSequence*muonSelectionTypeSequence*muIsolation*muonreco_with_standAloneSET)
 
 # ... instead, the sequences will be run in the following order:
 # 1st - standalonemuontracking

RecoMuon/Configuration/python/RecoMuon_EventContent_cff.py

@@ -65,25 +65,15 @@
                                            'keep *_displacedMuonSeeds_*_*',
                                            'keep TrackingRecHitsOwned_globalMuons_*_*',
                                            'keep TrackingRecHitsOwned_tevMuons_*_*',
-                                           'keep recoCaloMuons_calomuons_*_*',
                                            # Cosmics
                                            'keep *_CosmicMuonSeed_*_*',
                                            'keep recoTrackExtras_cosmicMuons_*_*',
                                            'keep TrackingRecHitsOwned_cosmicMuons_*_*',
                                            'keep recoTrackExtras_cosmicMuons1Leg_*_*',
                                            'keep TrackingRecHitsOwned_cosmicMuons1Leg_*_*',
-                                           'keep recoTracks_cosmicsVetoTracks_*_*',
-                                           # SET muons
-                                           'keep *_SETMuonSeed_*_*',
-                                           'keep recoTracks_standAloneSETMuons_*_*',
-                                           'keep recoTrackExtras_standAloneSETMuons_*_*',
-                                           'keep TrackingRecHitsOwned_standAloneSETMuons_*_*',
-                                           'keep recoTracks_globalSETMuons_*_*',
-                                           'keep recoTrackExtras_globalSETMuons_*_*',
-                                           'keep TrackingRecHitsOwned_globalSETMuons_*_*',
-                                           'keep recoMuons_muonsWithSET_*_*')
+                                           'keep recoTracks_cosmicsVetoTracks_*_*')
 )
-# Full Event content 
+# Full Event content
 RecoMuonFEVT = cms.PSet(
     outputCommands = cms.untracked.vstring()
 )

RecoMuon/Configuration/python/SETRecoMuon_cff.py

@@ -18,3 +18,4 @@
 #muonreco_with_SET = cms.Sequence(muontracking_with_SET*muonsWithSET)
 #run only the tracking part for SET, after that it should be merged with the main ones at some point
 muonreco_with_SET = cms.Sequence(muontracking_with_SET)
+muonreco_with_standAloneSET = cms.Sequence(SETMuonSeed*standAloneSETMuons)

RecoMuon/MuonIdentification/python/muonIdProducerSequence_cff.py

@@ -13,13 +13,12 @@
 from RecoMuon.MuonIdentification.isolation_cff import *
 from RecoMuon.MuonIdentification.muons1stStep_cfi import *
 from RecoMuon.MuonIdentification.muonTiming_cfi import *
-from RecoMuon.MuonIdentification.calomuons_cfi import *
 # Glb Track Quality
 from RecoMuon.GlobalTrackingTools.GlobalTrackQuality_cfi import *
 muons1stStep.fillGlobalTrackQuality = True
 
 from RecoMuon.MuonIdentification.cosmics_id import *
 
 from RecoMuon.MuonIdentification.muonShowerInformationProducer_cff import *
-muonIdProducerSequence = cms.Sequence(glbTrackQual*muons1stStep*calomuons*muonEcalDetIds*muonShowerInformation)
+muonIdProducerSequence = cms.Sequence(glbTrackQual*muons1stStep*muonEcalDetIds*muonShowerInformation)
 

RecoMuon/MuonIdentification/python/muons1stStep_cfi.py

@@ -45,7 +45,7 @@
     # AND
     maxAbsDy = cms.double(9999.0),
     minP = cms.double(2.5),
-    minPCaloMuon = cms.double(1.0),
+    minPCaloMuon = cms.double(1e9),
 
     # Match parameters
     maxAbsDx = cms.double(3.0),

Validation/RecoMuon/python/associators_cff.py

@@ -87,24 +87,6 @@
     label_tr = cms.InputTag('extractedGlobalMuons')
 )
 
-tpToStaSETTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer',
-    associator = cms.InputTag('trackAssociatorByDeltaR'),
-    label_tp = cms.InputTag('mix', 'MergedTrackTruth'),
-    label_tr = cms.InputTag('standAloneSETMuons','')
-)
-
-tpToStaSETUpdTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer',
-    associator = cms.InputTag('trackAssociatorByDeltaR'),
-    label_tp = cms.InputTag('mix', 'MergedTrackTruth'),
-    label_tr = cms.InputTag('standAloneSETMuons','UpdatedAtVtx')
-)
-
-tpToGlbSETTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer',
-    associator = cms.InputTag('trackAssociatorByDeltaR'),
-    label_tp = cms.InputTag('mix', 'MergedTrackTruth'),
-    label_tr = cms.InputTag('globalSETMuons')
-)
-
 tpToTevFirstTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer',
     associator = cms.InputTag('trackAssociatorByDeltaR'),
     label_tp = cms.InputTag('mix', 'MergedTrackTruth'),
@@ -173,9 +155,6 @@
 tpToDisplacedStaSeedAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
 tpToDisplacedStaMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
 tpToDisplacedGlbMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
-tpToStaSETMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
-tpToStaSETUpdMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
-tpToGlbSETMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
 tpToTevFirstMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
 tpToTevPickyMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
 tpToTevDytMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
@@ -241,21 +220,6 @@
 tpToDisplacedGlbMuonAssociation.UseTracker = True
 tpToDisplacedGlbMuonAssociation.UseMuon = True
 
-tpToStaSETMuonAssociation.tpTag = 'mix:MergedTrackTruth'
-tpToStaSETMuonAssociation.tracksTag = 'standAloneSETMuons'
-tpToStaSETMuonAssociation.UseTracker = False
-tpToStaSETMuonAssociation.UseMuon = True
-
-tpToStaSETUpdMuonAssociation.tpTag = 'mix:MergedTrackTruth'
-tpToStaSETUpdMuonAssociation.tracksTag = 'standAloneSETMuons:UpdatedAtVtx'
-tpToStaSETUpdMuonAssociation.UseTracker = False
-tpToStaSETUpdMuonAssociation.UseMuon = True
-
-tpToGlbSETMuonAssociation.tpTag = 'mix:MergedTrackTruth'
-tpToGlbSETMuonAssociation.tracksTag = 'globalSETMuons'
-tpToGlbSETMuonAssociation.UseTracker = True
-tpToGlbSETMuonAssociation.UseMuon = True
-
 tpToTevFirstMuonAssociation.tpTag = 'mix:MergedTrackTruth'
 tpToTevFirstMuonAssociation.tracksTag = 'tevMuons:firstHit'
 tpToTevFirstMuonAssociation.UseTracker = True
@@ -410,8 +374,6 @@
 
 muonAssociationRefit_seq = cms.Sequence(tpToStaRefitMuonAssociation+tpToStaRefitUpdMuonAssociation)
 
-muonAssociationSET_seq = cms.Sequence(tpToStaSETMuonAssociation+tpToStaSETUpdMuonAssociation+tpToGlbSETMuonAssociation)
-
 muonAssociationCosmic_seq = cms.Sequence(
     tpToTkCosmicSelMuonAssociation+ tpToTkCosmic1LegSelMuonAssociation
     +tpToStaCosmicSelMuonAssociation+tpToStaCosmic1LegSelMuonAssociation

Validation/RecoMuon/python/muonValidation_cff.py

@@ -43,27 +43,6 @@
 glbMuonTrackVTrackAssoc.usetracker = True
 glbMuonTrackVTrackAssoc.usemuon = True
 
-staSETMuonTrackVTrackAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-staSETMuonTrackVTrackAssoc.associatormap = 'tpToStaSETTrackAssociation'
-staSETMuonTrackVTrackAssoc.associators = ('trackAssociatorByDeltaR',)
-staSETMuonTrackVTrackAssoc.label = ('standAloneSETMuons',)
-staSETMuonTrackVTrackAssoc.usetracker = False
-staSETMuonTrackVTrackAssoc.usemuon = True
-
-staSETUpdMuonTrackVTrackAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-staSETUpdMuonTrackVTrackAssoc.associatormap = 'tpToStaSETUpdTrackAssociation'
-staSETUpdMuonTrackVTrackAssoc.associators = ('trackAssociatorByDeltaR',)
-staSETUpdMuonTrackVTrackAssoc.label = ('standAloneSETMuons:UpdatedAtVtx',)
-staSETUpdMuonTrackVTrackAssoc.usetracker = False
-staSETUpdMuonTrackVTrackAssoc.usemuon = True
-
-glbSETMuonTrackVTrackAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-glbSETMuonTrackVTrackAssoc.associatormap = 'tpToGlbSETTrackAssociation'
-glbSETMuonTrackVTrackAssoc.associators = ('trackAssociatorByDeltaR',)
-glbSETMuonTrackVTrackAssoc.label = ('globalSETMuons',)
-glbSETMuonTrackVTrackAssoc.usetracker = True
-glbSETMuonTrackVTrackAssoc.usemuon = True
-
 tevMuonFirstTrackVTrackAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
 tevMuonFirstTrackVTrackAssoc.associatormap = 'tpToTevFirstTrackAssociation'
 tevMuonFirstTrackVTrackAssoc.associators = ('trackAssociatorByDeltaR',)
@@ -186,27 +165,6 @@
 displacedGlbMuonTrackVMuonAssoc.tipTP = cms.double(85.)
 displacedGlbMuonTrackVMuonAssoc.lipTP = cms.double(210.)
 
-staSETMuonTrackVMuonAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-staSETMuonTrackVMuonAssoc.associatormap = 'tpToStaSETMuonAssociation'
-staSETMuonTrackVMuonAssoc.associators = ('MuonAssociationByHits',)
-staSETMuonTrackVMuonAssoc.label = ('standAloneSETMuons',)
-staSETMuonTrackVMuonAssoc.usetracker = False
-staSETMuonTrackVMuonAssoc.usemuon = True
-
-staSETUpdMuonTrackVMuonAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-staSETUpdMuonTrackVMuonAssoc.associatormap = 'tpToStaSETUpdMuonAssociation'
-staSETUpdMuonTrackVMuonAssoc.associators = ('MuonAssociationByHits',)
-staSETUpdMuonTrackVMuonAssoc.label = ('standAloneSETMuons:UpdatedAtVtx',)
-staSETUpdMuonTrackVMuonAssoc.usetracker = False
-staSETUpdMuonTrackVMuonAssoc.usemuon = True
-
-glbSETMuonTrackVMuonAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
-glbSETMuonTrackVMuonAssoc.associatormap = 'tpToGlbSETMuonAssociation'
-glbSETMuonTrackVMuonAssoc.associators = ('MuonAssociationByHits',)
-glbSETMuonTrackVMuonAssoc.label = ('globalSETMuons',)
-glbSETMuonTrackVMuonAssoc.usetracker = True
-glbSETMuonTrackVMuonAssoc.usemuon = True
-
 tevMuonFirstTrackVMuonAssoc = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone()
 tevMuonFirstTrackVMuonAssoc.associatormap = 'tpToTevFirstMuonAssociation'
 tevMuonFirstTrackVMuonAssoc.associators = ('MuonAssociationByHits',)
@@ -436,12 +394,6 @@
     +tpToDisplacedGlbMuonAssociation + displacedGlbMuonTrackVMuonAssoc
 )
 
-muonValidationSET_seq = cms.Sequence(
-    tpToStaSETMuonAssociation + staSETMuonTrackVMuonAssoc
-    +tpToStaSETUpdMuonAssociation + staSETUpdMuonTrackVMuonAssoc
-    +tpToGlbSETMuonAssociation + glbSETMuonTrackVMuonAssoc
-)
-
 muonValidationCosmic_seq = cms.Sequence(
     tpToTkCosmicSelMuonAssociation + trkCosmicMuonTrackVSelMuonAssoc
     +tpToTkCosmic1LegSelMuonAssociation + trkCosmic1LegMuonTrackVSelMuonAssoc
@@ -453,11 +405,11 @@
 
 # The full offline muon validation sequence
 recoMuonValidation = cms.Sequence(
-    muonValidation_seq + muonValidationTEV_seq + muonValidationRefit_seq + muonValidationDisplaced_seq + muonValidationSET_seq
+    muonValidation_seq + muonValidationTEV_seq + muonValidationRefit_seq + muonValidationDisplaced_seq
 )
 
 from Configuration.StandardSequences.Eras import eras
-# no displaces or SET muons in fastsim
+# no displaces in fastsim
 if eras.fastSim.isChosen():
     recoMuonValidation = cms.Sequence(muonValidation_seq + muonValidationTEV_seq + muonValidationRefit_seq)