cms-sw · ktf · Aug 5, 2014 · Jul 19, 2014 · Jul 19, 2014 · Jul 19, 2014
diff --git a/DQM/Physics/python/ExoticaDQM_cfi.py b/DQM/Physics/python/ExoticaDQM_cfi.py
@@ -59,7 +59,7 @@
     pfJetCollection          = cms.InputTag("ak4PFJets"),
     pfJetCollectionEI        = cms.InputTag("pfJets"),
 
-    caloMETCollection        = cms.InputTag("corMetGlobalMuons","","RECO"),
+    caloMETCollection        = cms.InputTag("caloMetM","","RECO"),
     pfMETCollection          = cms.InputTag("pfMet","","RECO"),
     pfMETCollectionEI        = cms.InputTag("pfMetEI","","RECO"),
 

diff --git a/DQM/Physics/python/HiggsDQM_cfi.py b/DQM/Physics/python/HiggsDQM_cfi.py
@@ -7,7 +7,7 @@
     muonCollection           = cms.InputTag("muons"),
     electronCollection       = cms.InputTag("gedGsfElectrons"),
     caloJetCollection        = cms.InputTag("ak4CaloJets"),
-    caloMETCollection        = cms.InputTag("corMetGlobalMuons"),
+    caloMETCollection        = cms.InputTag("caloMetM"),
     pfMETCollection          = cms.InputTag("pfMet"),
     genParticleCollection    = cms.InputTag("genParticles"),
 

diff --git a/DQM/Physics/python/ewkDQM_cfi.py b/DQM/Physics/python/ewkDQM_cfi.py
@@ -10,7 +10,7 @@
             muonCollection           = cms.InputTag("muons"),
             electronCollection       = cms.InputTag("gedGsfElectrons"),
             PFJetCollection          = cms.InputTag("ak4PFJets"),
-            caloMETCollection        = cms.InputTag("corMetGlobalMuons"),
+            caloMETCollection        = cms.InputTag("caloMetM"),
             vertexCollection         = cms.InputTag("offlinePrimaryVertices"),
             #genParticleCollection    = cms.InputTag("genParticles")
             EJetMin = cms.untracked.double(15.0)

diff --git a/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py b/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py
@@ -155,7 +155,7 @@
      # For mucorrMET
      #
      mucorrMETAnalysis = metDQMParameters.clone(
-         METCollectionLabel = cms.InputTag("corMetGlobalMuons"),
+         METCollectionLabel = cms.InputTag("caloMetM"),
          Source             = cms.string("MuCorrMET"),
          InputBeamSpotLabel = cms.InputTag("offlineBeamSpot"),
          DCSFilter = cms.PSet(

diff --git a/Documentation/DataFormats/python/RecoMET_dataformats.py b/Documentation/DataFormats/python/RecoMET_dataformats.py
@@ -53,7 +53,7 @@
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF"
      },
      {
-      "instance": "corMetGlobalMuons",
+      "instance": "caloMetM",
       "container": "recoCaloMETs",
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF with corrections for muons"
      },
@@ -183,7 +183,7 @@
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF"
      },
      {
-      "instance": "corMetGlobalMuons",
+      "instance": "caloMetM",
       "container": "recoCaloMETs",
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF with corrections for muons"
      },
@@ -268,7 +268,7 @@
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF"
      },
      {
-      "instance": "corMetGlobalMuons",
+      "instance": "caloMetM",
       "container": "recoCaloMETs",
       "desc": "MET in energy deposits in calorimeter towers in EB, EE, HB, HE, and HF with corrections for muons"
      },

diff --git a/ElectroWeakAnalysis/WENu/test/genPurposeSkimmer.py b/ElectroWeakAnalysis/WENu/test/genPurposeSkimmer.py
@@ -54,7 +54,7 @@
 process.metMuonJESCorSC5 = process.metJESCorSC5CaloJet.clone()
 process.metMuonJESCorSC5.inputUncorJetsLabel = "sisCone5CaloJets"
 process.metMuonJESCorSC5.corrector = "L2L3JetCorrectorSC5Calo"
-process.metMuonJESCorSC5.inputUncorMetLabel = "corMetGlobalMuons"
+process.metMuonJESCorSC5.inputUncorMetLabel = "caloMetM"
 
 process.metCorSequence = cms.Sequence(process.metMuonJESCorSC5)
 

diff --git a/ElectroWeakAnalysis/WENu/test/genPurposeSkimmer_acceptance.py b/ElectroWeakAnalysis/WENu/test/genPurposeSkimmer_acceptance.py
@@ -53,7 +53,7 @@
 process.metMuonJESCorSC5 = process.metJESCorSC5CaloJet.clone()
 process.metMuonJESCorSC5.inputUncorJetsLabel = "sisCone5CaloJets"
 process.metMuonJESCorSC5.corrector = "L2L3JetCorrectorSC5Calo"
-process.metMuonJESCorSC5.inputUncorMetLabel = "corMetGlobalMuons"
+process.metMuonJESCorSC5.inputUncorMetLabel = "caloMetM"
 
 process.metCorSequence = cms.Sequence(process.metMuonJESCorSC5)
 

diff --git a/ElectroWeakAnalysis/WMuNu/python/wmunusProducer_cfi.py b/ElectroWeakAnalysis/WMuNu/python/wmunusProducer_cfi.py
@@ -17,7 +17,7 @@
 corMetWMuNus = cms.EDProducer("WMuNuProducer",
       # Input collections ->
       MuonTag = cms.untracked.InputTag("muons"),
-      METTag = cms.untracked.InputTag("corMetGlobalMuons")
+      METTag = cms.untracked.InputTag("caloMetM")
 )
 
 allWMuNus = cms.Sequence(corMetWMuNus

diff --git a/FWCore/GuiBrowsers/python/Vispa/Plugins/EdmBrowser/EventContentDialog.py b/FWCore/GuiBrowsers/python/Vispa/Plugins/EdmBrowser/EventContentDialog.py
diff --git a/JetMETCorrections/Type1MET/python/correctedMet_cff.py b/JetMETCorrections/Type1MET/python/correctedMet_cff.py
@@ -3,7 +3,7 @@
 ##____________________________________________________________________________||
 caloMetT1 = cms.EDProducer(
     "AddCorrectionsToCaloMET",
-    src = cms.InputTag('corMetGlobalMuons'),
+    src = cms.InputTag('caloMetM'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrCaloMetType1', 'type1')
         ),
@@ -12,7 +12,7 @@
 ##____________________________________________________________________________||
 caloMetT1T2 = cms.EDProducer(
     "AddCorrectionsToCaloMET",
-    src = cms.InputTag('corMetGlobalMuons'),
+    src = cms.InputTag('caloMetM'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrCaloMetType1', 'type1'),
         cms.InputTag('corrCaloMetType2')

diff --git a/JetMETCorrections/Type1MET/python/correctionTermsCaloMet_cff.py b/JetMETCorrections/Type1MET/python/correctionTermsCaloMet_cff.py
@@ -11,7 +11,7 @@
     type1JetPtThreshold = cms.double(20.0),
     skipEM = cms.bool(True),
     skipEMfractionThreshold = cms.double(0.90),
-    srcMET = cms.InputTag('corMetGlobalMuons')
+    srcMET = cms.InputTag('caloMetM')
 )
 
 ##____________________________________________________________________________||
@@ -25,7 +25,7 @@
     "Type2CorrectionProducer",
     srcUnclEnergySums = cms.VInputTag(
         cms.InputTag('corrCaloMetType1', 'type2'),
-        cms.InputTag('muCaloMetCorr') # NOTE: use this for 'corMetGlobalMuons', do **not** use it for 'met' !!
+        cms.InputTag('muCaloMetCorr') # NOTE: use this for 'caloMetM', do **not** use it for 'met' !!
         ),
     type2CorrFormula = cms.string("A + B*TMath::Exp(-C*x)"),
     type2CorrParameter = cms.PSet(

diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py
@@ -484,10 +484,10 @@ def toolCode(self, process):
                     from JetMETCorrections.Type1MET.correctionTermsCaloMet_cff import corrCaloMetType2
                     from JetMETCorrections.Type1MET.correctedMet_cff import caloMetT1
                     from JetMETCorrections.Type1MET.correctedMet_cff import caloMetT1T2
-                    setattr(process,jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, corrCaloMetType1.clone(src=jetSource,srcMET = "corMetGlobalMuons",jetCorrections = cms.string(jetCorrections[0]+'CombinedCorrector')))
+                    setattr(process,jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, corrCaloMetType1.clone(src=jetSource,srcMET = "caloMetM",jetCorrections = cms.string(jetCorrections[0]+'CombinedCorrector')))
                     setattr(process,jetCorrections[0]+_labelCorrName+'JetMETcorr2'+postfix, corrCaloMetType2.clone(srcUnclEnergySums = cms.VInputTag(cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'type2'),cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'offset'),cms.InputTag('muCaloMetCorr'))))
-                    setattr(process,jetCorrections[0]+_labelCorrName+'Type1CorMet'+postfix, caloMetT1.clone(src = "corMetGlobalMuons", srcCorrections = cms.VInputTag(cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'type1'))))
-                    setattr(process,jetCorrections[0]+_labelCorrName+'Type1p2CorMet'+postfix, caloMetT1T2.clone(src = "corMetGlobalMuons", srcCorrections = cms.VInputTag(cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'type1'), cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr2'+postfix))))
+                    setattr(process,jetCorrections[0]+_labelCorrName+'Type1CorMet'+postfix, caloMetT1.clone(src = "caloMetM", srcCorrections = cms.VInputTag(cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'type1'))))
+                    setattr(process,jetCorrections[0]+_labelCorrName+'Type1p2CorMet'+postfix, caloMetT1T2.clone(src = "caloMetM", srcCorrections = cms.VInputTag(cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr'+postfix, 'type1'), cms.InputTag(jetCorrections[0]+_labelCorrName+'JetMETcorr2'+postfix))))
 
                 elif _type == 'PF':
                     from JetMETCorrections.Type1MET.correctionTermsPfMetType1Type2_cff import pfJetsPtrForMetCorr

diff --git a/RecoMET/Configuration/python/RecoMET_Cosmics_cff.py b/RecoMET/Configuration/python/RecoMET_Cosmics_cff.py
@@ -14,7 +14,6 @@
       caloMetBE+
       caloMetBEFO+
       muonMETValueMapProducer+
-      corMetGlobalMuons+
       caloMetM +
       hcalnoise+
       BeamHaloId
@@ -26,7 +25,6 @@
     caloMetBE+
     caloMetBEFO+
     muonMETValueMapProducer+
-    corMetGlobalMuons+
     caloMetM +
     hcalnoise
     )
@@ -37,7 +35,6 @@
     caloMetBE+
     caloMetBEFO+
     muonMETValueMapProducer+
-    corMetGlobalMuons+
     caloMetM +
     BeamHaloId
 )

diff --git a/RecoMET/Configuration/python/RecoMET_EventContent_cff.py b/RecoMET/Configuration/python/RecoMET_EventContent_cff.py
@@ -5,7 +5,6 @@
     outputCommands = cms.untracked.vstring('keep recoCaloMETs_caloMet_*_*',
                                            'keep recoCaloMETs_caloMetBE_*_*',
                                            'keep recoCaloMETs_caloMetBEFO_*_*',
-                                           'keep recoCaloMETs_corMetGlobalMuons_*_*',
                                            'keep recoCaloMETs_caloMetM_*_*',
                                            'keep recoPFMETs_pfMet_*_*',
                                            'keep recoPFMETs_pfChMet_*_*',
@@ -32,7 +31,6 @@
     outputCommands = cms.untracked.vstring('keep recoCaloMETs_caloMet_*_*',
                                            'keep recoCaloMETs_caloMetBE_*_*',
                                            'keep recoCaloMETs_caloMetBEFO_*_*',
-                                           'keep recoCaloMETs_corMetGlobalMuons_*_*',
                                            'keep recoCaloMETs_caloMetM_*_*',
                                            'keep recoPFMETs_pfMet_*_*',
                                            'keep recoPFMETs_pfChMet_*_*',
@@ -59,7 +57,6 @@
     outputCommands = cms.untracked.vstring('keep recoCaloMETs_caloMet_*_*',
                                            'keep recoCaloMETs_caloMetBE_*_*',
                                            'keep recoCaloMETs_caloMetBEFO_*_*',
-                                           'keep recoCaloMETs_corMetGlobalMuons_*_*',
                                            'keep recoCaloMETs_caloMetM_*_*',
                                            'keep recoPFMETs_pfMet_*_*',
                                            'keep recoPFMETs_pfChMet_*_*',

diff --git a/RecoMET/Configuration/python/RecoMET_cff.py b/RecoMET/Configuration/python/RecoMET_cff.py
@@ -5,7 +5,6 @@
 from RecoMET.METProducers.CaloMET_cfi import *
 from RecoMET.METProducers.hcalnoiseinfoproducer_cfi import *
 from RecoMET.METProducers.MuonMETValueMapProducer_cff import *
-from RecoMET.METProducers.MetMuonCorrections_cff import *
 from RecoMET.METProducers.caloMetM_cfi import *
 from RecoMET.Configuration.RecoMET_BeamHaloId_cff import *
 
@@ -15,7 +14,6 @@
         caloMetBE+
         caloMetBEFO+
         muonMETValueMapProducer+
-        corMetGlobalMuons+
         caloMetM +
         BeamHaloId
         )

diff --git a/RecoMET/METProducers/test/recoMET_caloMet_cfg.py b/RecoMET/METProducers/test/recoMET_caloMet_cfg.py
@@ -9,7 +9,6 @@
 ##____________________________________________________________________________||
 process.load("RecoMET.METProducers.CaloMET_cfi")
 process.load("RecoMET.METProducers.METSigParams_cfi")
-process.load("RecoMET.METProducers.MetMuonCorrections_cff")
 process.load("RecoMET.METProducers.caloMetM_cfi")
 process.load("RecoJets.Configuration.CaloTowersRec_cff")
 process.load("Configuration.StandardSequences.Geometry_cff")
@@ -58,7 +57,6 @@
     process.caloMetBE *
     process.caloMetBEO *
     process.caloMetM *
-    process.corMetGlobalMuons *
     process.caloMetWithSignificance
     )
 

diff --git a/Validation/RecoMET/python/METValidation_cfi.py b/Validation/RecoMET/python/METValidation_cfi.py
@@ -85,7 +85,7 @@
 #corMetGlobalMuonsAnalyzer = cms.EDAnalyzer(
 #    "METTester",
 #     OutputFile = cms.untracked.string(''),
-#    InputMETLabel = cms.InputTag("corMetGlobalMuons"),
+#    InputMETLabel = cms.InputTag("caloMetM"),
 #    METType = cms.untracked.string("cor")
 #    ) 
 

diff --git a/Validation/RecoParticleFlow/python/metBenchmark_cff.py b/Validation/RecoParticleFlow/python/metBenchmark_cff.py
@@ -9,7 +9,7 @@
 from JetMETCorrections.Type1MET.MetType1Corrections_cff import metJESCorAK5CaloJet
 
 metMuonJESCorAK5 = metJESCorAK5CaloJet.clone()
-metMuonJESCorAK5.inputUncorMetLabel = "corMetGlobalMuons"
+metMuonJESCorAK5.inputUncorMetLabel = "caloMetM"
 
 metCorSequence = cms.Sequence(metMuonJESCorAK5)
 #########
@@ -47,8 +47,8 @@
 MatchCaloMetBenchmark.BenchmarkLabel = 'metMuonJESCorAK5'
 
 UncorrCaloMetBenchmark = metBenchmark.clone()
-UncorrCaloMetBenchmark.InputCollection = 'corMetGlobalMuons'
-UncorrCaloMetBenchmark.BenchmarkLabel = 'corMetGlobalMuons'
+UncorrCaloMetBenchmark.InputCollection = 'caloMetM'
+UncorrCaloMetBenchmark.BenchmarkLabel = 'caloMetM'
 UncorrCaloMetBenchmark.mode = 2
 
 metBenchmarkSequence = cms.Sequence( metCorSequence+pfMetBenchmark+caloMetBenchmark+trueMetBenchmark+MatchPfMetBenchmark+MatchCaloMetBenchmark )