point DQM modules at the correct collections

photonAnalyzer is left alone for now, Nancy will update in the future.
ggovi · Dec 18, 2013 · a5de525 · a5de525
1 parent cc5a841
commit a5de525
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 39 deletions.
diff --git a/DQM/Physics/python/ExoticaDQM_cfi.py b/DQM/Physics/python/ExoticaDQM_cfi.py
@@ -43,7 +43,7 @@
     ),
 
     #Physics objects
-    electronCollection       = cms.InputTag("gsfElectrons"),
+    electronCollection       = cms.InputTag("gedGsfElectrons"),
     pfelectronCollectionEI   = cms.InputTag("pfIsolatedElectronsEI"),
 
     muonCollection           = cms.InputTag("muons"),
@@ -52,7 +52,7 @@
     tauCollection            = cms.InputTag("caloRecoTauProducer"),
     #pftauCollection          = cms.InputTag("pfTaus"),
 
-    photonCollection         = cms.InputTag("photons"),
+    photonCollection         = cms.InputTag("gedPhotons"),
     #pfphotonCollection       = cms.InputTag("pfIsolatedPhotons"),
 
     caloJetCollection        = cms.InputTag("ak5CaloJets"),

diff --git a/DQM/Physics/python/HiggsDQM_cfi.py b/DQM/Physics/python/HiggsDQM_cfi.py
@@ -5,7 +5,7 @@
     muonTriggerPathToPass    = cms.string("HLT_Mu9"),
     triggerResultsCollection = cms.InputTag("TriggerResults", "", "HLT"),
     muonCollection           = cms.InputTag("muons"),
-    electronCollection       = cms.InputTag("gsfElectrons"),
+    electronCollection       = cms.InputTag("gedGsfElectrons"),
     caloJetCollection        = cms.InputTag("ak5CaloJets"),
     caloMETCollection        = cms.InputTag("corMetGlobalMuons"),
     pfMETCollection          = cms.InputTag("pfMet"),

diff --git a/DQM/Physics/python/ewkDQM_cfi.py b/DQM/Physics/python/ewkDQM_cfi.py
@@ -8,7 +8,7 @@
             triggerResultsCollection = cms.InputTag("TriggerResults", "", "HLT"),
 
             muonCollection           = cms.InputTag("muons"),
-            electronCollection       = cms.InputTag("gsfElectrons"),
+            electronCollection       = cms.InputTag("gedGsfElectrons"),
             PFJetCollection          = cms.InputTag("ak5PFJets"),
             caloMETCollection        = cms.InputTag("corMetGlobalMuons"),
             vertexCollection         = cms.InputTag("offlinePrimaryVertices"),

diff --git a/DQM/Physics/python/ewkElecDQM_cfi.py b/DQM/Physics/python/ewkElecDQM_cfi.py
@@ -5,7 +5,7 @@
       # Input collections ->
       TrigTag = cms.untracked.InputTag("TriggerResults::HLT"),
 #      MuonTag = cms.untracked.InputTag("muons"),
-      ElecTag = cms.untracked.InputTag("gsfElectrons"),
+      ElecTag = cms.untracked.InputTag("gedGsfElectrons"),
       METTag = cms.untracked.InputTag("pfMet"),
       METIncludesMuons = cms.untracked.bool(False),
       JetTag = cms.untracked.InputTag("ak5PFJets"),

diff --git a/DQM/Physics/python/ewkTauDQM_cfi.py b/DQM/Physics/python/ewkTauDQM_cfi.py
@@ -60,7 +60,7 @@
             triggerResultsSource = cms.InputTag("TriggerResults::HLT"),
             vertexSource = cms.InputTag("offlinePrimaryVertices"),
             beamSpotSource = cms.InputTag("offlineBeamSpot"),
-            electronSource = cms.InputTag("gsfElectrons"),
+            electronSource = cms.InputTag("gedGsfElectrons"),
             tauJetSource = cms.InputTag("shrinkingConePFTauProducer"),
             caloMEtSource = cms.InputTag("met"),
             pfMEtSource = cms.InputTag("pfMet"),

diff --git a/DQM/Physics/python/qcdPhotonsDQM_cfi.py b/DQM/Physics/python/qcdPhotonsDQM_cfi.py
@@ -7,7 +7,7 @@
                 plotTheseTriggersToo      = cms.vstring("HLT_Photon20","HLT_Photon25","HLT_Photon30","HLT_Photon50","HLT_DoublePhoton"),
                 # Collections
                 trigTag                   = cms.untracked.InputTag("TriggerResults::HLT"),
-                photonCollection          = cms.InputTag("photons"),
+                photonCollection          = cms.InputTag("gedPhotons"),
                 jetCollection             = cms.InputTag("ak5PFJets"),
                 vertexCollection          = cms.InputTag("offlinePrimaryVertices"),
                 # Cuts on the reco objects

diff --git a/DQM/Physics/python/singleTopDQM_cfi.py b/DQM/Physics/python/singleTopDQM_cfi.py
@@ -16,7 +16,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -145,7 +145,7 @@
     sources = cms.PSet(
     muons = cms.InputTag("particleFlow"),
 #    muons = cms.InputTag("muons"),
-    elecs_gsf = cms.InputTag("gsfElectrons"),
+    elecs_gsf = cms.InputTag("gedGsfElectrons"),
     elecs = cms.InputTag("particleFlow"),
     jets  = cms.InputTag("ak5PFJetsCHS"),
     mets  = cms.VInputTag("met", "tcMet", "pfMet"),
@@ -305,7 +305,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("particleFlow"),
-      elecs_gsf = cms.InputTag("gsfElectrons"),
+      elecs_gsf = cms.InputTag("gedGsfElectrons"),
       elecs = cms.InputTag("particleFlow"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),

diff --git a/DQM/Physics/python/susyDQM_cfi.py b/DQM/Physics/python/susyDQM_cfi.py
@@ -5,7 +5,7 @@
     moduleName     = cms.untracked.string('Physics/Susy'),
 
     muonCollection = cms.InputTag('muons'),
-    electronCollection = cms.InputTag('gsfElectrons'),
+    electronCollection = cms.InputTag('gedGsfElectrons'),
     jetCollection = cms.InputTag('ak5CaloJets'),
     metCollection = cms.InputTag('met'),
     vertexCollection = cms.InputTag('offlinePrimaryVertices'),

diff --git a/DQM/Physics/python/topDiLeptonDQM_cfi.py b/DQM/Physics/python/topDiLeptonDQM_cfi.py
@@ -23,7 +23,7 @@
     muon_eta_cut   = cms.double( 2.4 ),
     muon_iso_cut   = cms.double( 0.2 ),
     ### 
-    elecCollection = cms.InputTag('gsfElectrons'),
+    elecCollection = cms.InputTag('gedGsfElectrons'),
     elec_pT_cut    = cms.double( 5.0 ),
     elec_eta_cut   = cms.double( 2.4 ),
     elec_iso_cut   = cms.double( 0.2 ),

diff --git a/DQM/Physics/python/topDiLeptonOfflineDQM_cfi.py b/DQM/Physics/python/topDiLeptonOfflineDQM_cfi.py
@@ -16,7 +16,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -166,7 +166,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -315,7 +315,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -427,7 +427,7 @@
     #),
     cms.PSet(
       label = cms.string("elecs:step0"),
-      src   = cms.InputTag("gsfElectrons"),
+      src   = cms.InputTag("gedGsfElectrons"),
 #      electronId = cms.PSet(
 #        src = cms.InputTag("simpleEleId70cIso"),
 #        pattern = cms.int32(1)
@@ -468,7 +468,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -587,7 +587,7 @@
     ),
     cms.PSet(
       label = cms.string("elecs:step1"),
-      src   = cms.InputTag("gsfElectrons"),
+      src   = cms.InputTag("gedGsfElectrons"),
       #electronId = cms.PSet(
       #  src = cms.InputTag("simpleEleId70cIso"),
       #  pattern = cms.int32(1)

diff --git a/DQM/Physics/python/topElectronID_cff.py b/DQM/Physics/python/topElectronID_cff.py
@@ -3,7 +3,7 @@
 ## test for electronId
 simpleEleId70cIso = cms.EDProducer(
     "EleIdCutBasedExtProducer",
-    src = cms.InputTag("gsfElectrons"),
+    src = cms.InputTag("gedGsfElectrons"),
     reducedBarrelRecHitCollection = cms.InputTag("reducedEcalRecHitsEB"),
     reducedEndcapRecHitCollection = cms.InputTag("reducedEcalRecHitsEE"),
     verticesCollection = cms.InputTag("offlineBeamSpot"),

diff --git a/DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py b/DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py
@@ -15,7 +15,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -144,7 +144,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -304,7 +304,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -469,7 +469,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -578,7 +578,7 @@
   selection = cms.VPSet(
     cms.PSet(
       label  = cms.string("elecs:step0"),
-      src    = cms.InputTag("gsfElectrons"),
+      src    = cms.InputTag("gedGsfElectrons"),
       electronId = cms.PSet( src = cms.InputTag("simpleEleId70cIso"), pattern = cms.int32(1) ),
       select = cms.string("pt>30 & abs(eta)<2.5"),
       min    = cms.int32(1),
@@ -631,7 +631,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -740,7 +740,7 @@
   selection = cms.VPSet(
     cms.PSet(
       label = cms.string("elecs:step0"),
-      src   = cms.InputTag("gsfElectrons"),
+      src   = cms.InputTag("gedGsfElectrons"),
       electronId = cms.PSet( src = cms.InputTag("simpleEleId70cIso"), pattern = cms.int32(1) ),
       select = cms.string("pt>25 & abs(eta)<2.5 & (dr03TkSumPt+dr03EcalRecHitSumEt+dr03HcalTowerSumEt)/pt<0.1"),
       min = cms.int32(1),

diff --git a/DQM/Physics/python/topSingleLeptonDQM_cfi.py b/DQM/Physics/python/topSingleLeptonDQM_cfi.py
@@ -15,7 +15,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -145,7 +145,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -323,7 +323,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -506,7 +506,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -616,7 +616,7 @@
   selection = cms.VPSet(
     cms.PSet(
       label  = cms.string("elecs:step0"),
-      src    = cms.InputTag("gsfElectrons"),
+      src    = cms.InputTag("gedGsfElectrons"),
       #electronId = cms.PSet( src = cms.InputTag("simpleEleId70cIso"), pattern = cms.int32(1) ),
       select = cms.string("pt>15 & abs(eta)<2.5"),
       min    = cms.int32(1),
@@ -687,7 +687,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5PFJetsCHS"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -797,7 +797,7 @@
   selection = cms.VPSet(
     cms.PSet(
       label = cms.string("elecs:step0"),
-      src   = cms.InputTag("gsfElectrons"),
+      src   = cms.InputTag("gedGsfElectrons"),
       #electronId = cms.PSet( src = cms.InputTag("simpleEleId70cIso"), pattern = cms.int32(1) ),
       select = cms.string("pt>25 & abs(eta)<2.5 & (dr03TkSumPt+dr03EcalRecHitSumEt+dr03HcalTowerSumEt)/pt<0.1"),
       min = cms.int32(1),

diff --git a/DQMOffline/EGamma/python/photonAnalyzer_cfi.py b/DQMOffline/EGamma/python/photonAnalyzer_cfi.py
@@ -6,7 +6,7 @@
 
     Name = cms.untracked.string('photonAnalysis'),
 
-    phoProducer = cms.InputTag('photons'),
+    phoProducer = cms.InputTag('gedphotons'),
 
     photonIDLoose = cms.InputTag('PhotonIDProd:PhotonCutBasedIDLoose'),
     photonIDTight = cms.InputTag('PhotonIDProd:PhotonCutBasedIDTight'),																

diff --git a/DQMOffline/EGamma/python/zmumugammaAnalyzer_cfi.py b/DQMOffline/EGamma/python/zmumugammaAnalyzer_cfi.py
@@ -6,7 +6,7 @@
 
     Name = cms.untracked.string('zmumugammaAnalysis'),
 
-    phoProducer = cms.InputTag('photons'),
+    phoProducer = cms.InputTag('gedPhotons'),
 
     photonIDLoose = cms.InputTag('PhotonIDProd:PhotonCutBasedIDLoose'),
     photonIDTight = cms.InputTag('PhotonIDProd:PhotonCutBasedIDTight'),

diff --git a/DQMOffline/Ecal/python/EcalZmassTask_cfi.py b/DQMOffline/Ecal/python/EcalZmassTask_cfi.py
@@ -2,7 +2,7 @@
 
 ecalzmasstask = cms.EDAnalyzer("EcalZmassTask",
 	  prefixME = cms.untracked.string('EcalCalibration'),
-	  electronCollection    = cms.InputTag("gsfElectrons"),
+	  electronCollection    = cms.InputTag("gedGsfElectrons"),
     trackCollection = cms.InputTag("electronGsfTracks")
  )
 
diff --git a/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py b/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py
@@ -142,7 +142,7 @@
          Source             = cms.string("TcMET"),
          InputTrackLabel    = cms.InputTag("generalTracks"),
          InputMuonLabel     = cms.InputTag("muons"),
-         InputElectronLabel = cms.InputTag("gsfElectrons"),
+         InputElectronLabel = cms.InputTag("gedGsfElectrons"),
          InputBeamSpotLabel = cms.InputTag("offlineBeamSpot"),
          DCSFilter = cms.PSet(
            DetectorTypes = cms.untracked.string("ecal:hbhe:hf:pixel:sistrip:es:muon"),

diff --git a/RecoEgamma/Configuration/python/RecoEgamma_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_cff.py
@@ -25,7 +25,7 @@
 #egammaHighLevelRecoPostPF = cms.Sequence(gsfElectronMergingSequence*interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)
 #adding new gedGsfElectronSequence and gedPhotonSequence :
 #egammaHighLevelRecoPostPF = cms.Sequence(gsfElectronMergingSequence*gedGsfElectronSequence*interestingEgammaIsoDetIds*gedPhotonSequence*photonIDSequence*eIdSequence*hfEMClusteringSequence)
-egammaHighLevelRecoPostPF = cms.Sequence(interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)
+egammaHighLevelRecoPostPF = cms.Sequence(interestingEgammaIsoDetIds*photonIDSequenceGED*eIdSequence*hfEMClusteringSequence)
 
 
 egammarecoFull = cms.Sequence(egammareco*interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)

diff --git a/RecoEgamma/PhotonIdentification/python/photonId_cff.py b/RecoEgamma/PhotonIdentification/python/photonId_cff.py
@@ -2,6 +2,7 @@
 
 # Producer for Hybrid BasicClusters and SuperClusters
 from RecoEgamma.PhotonIdentification.photonId_cfi import *
+PhotonIDProdGED = PhotonIDProd.clone(photonProducer = cms.string('gedPhotons'))
 # photonID sequence
 photonIDSequence = cms.Sequence(PhotonIDProd)
-
+photonIDSequenceGED = cms.Sequence(PhotonIDProdGED)