E-gamma GED RECO as default

igv4321 · Dec 18, 2013 · 9c93cb6 · 9c93cb6
1 parent 91a121e
commit 9c93cb6
Show file tree

Hide file tree

Showing 69 changed files with 243 additions and 234 deletions.
diff --git a/DQMOffline/EGamma/python/electronAnalyzer_cfi.py b/DQMOffline/EGamma/python/electronAnalyzer_cfi.py
@@ -14,7 +14,7 @@
     OutputFolderName = cms.string("Egamma/Electrons"),
 
     Selection = cms.int32(1), # 0=All elec, 1=Etcut, 2=Iso, 3=eId
-    ElectronCollection = cms.InputTag("gsfElectrons"),
+    ElectronCollection = cms.InputTag("gedGsfElectrons"),
     MatchingObjectCollection = cms.InputTag("mergedSuperClusters"),
     TrackCollection = cms.InputTag("generalTracks"),
     GsfTrackCollection = cms.InputTag("electronGsfTracks"),

diff --git a/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py b/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py
@@ -10,7 +10,7 @@
     InputFolderName = cms.string("Egamma/Electrons/General"),
     OutputFolderName = cms.string("Egamma/Electrons/General"),
 
-    ElectronCollection = cms.InputTag("gsfElectrons"),
+    ElectronCollection = cms.InputTag("gedGsfElectrons"),
     MatchingObjectCollection = cms.InputTag("mergedSuperClusters"),
     TrackCollection = cms.InputTag("generalTracks"),
     GsfTrackCollection = cms.InputTag("electronGsfTracks"),

diff --git a/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py b/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py
@@ -14,7 +14,7 @@
     OutputFolderName = cms.string("Egamma/Electrons/TagAndProbe"),
 
     Selection = cms.int32(3), # 0=All elec, 1=Etcut, 2=Iso, 3=eId
-    ElectronCollection = cms.InputTag("gsfElectrons"),
+    ElectronCollection = cms.InputTag("gedGsfElectrons"),
     MatchingObjectCollection = cms.InputTag("mergedSuperClusters"),
     TrackCollection = cms.InputTag("generalTracks"),
     GsfTrackCollection = cms.InputTag("electronGsfTracks"),

diff --git a/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py b/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py
@@ -56,9 +56,7 @@
     particleFlowTmp+
     particleFlowTmpPtrs+
     particleFlowEGammaFinal+
-    FSparticleFlow+
-    pfElectronTranslatorSequence+
-    pfPhotonTranslatorSequence
+    FSparticleFlow
 )
 
 particleFlowLinks = cms.Sequence(particleFlow+particleFlowPtrs)

diff --git a/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py b/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py
@@ -56,9 +56,7 @@
     particleFlowTmp+
     particleFlowTmpPtrs+
     particleFlowEGammaFinal+
-    FSparticleFlow+
-    pfElectronTranslatorSequence+
-    pfPhotonTranslatorSequence
+    FSparticleFlow
 )
 
 particleFlowLinks = cms.Sequence(particleFlow*particleFlowPtrs)

diff --git a/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py b/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py
@@ -91,7 +91,7 @@
 		    "HLT_Ele17_CaloIdT_CaloIsoVL_TrkIdVL_TrkIsoVL_Ele8_CaloIdT_CaloIsoVL_TrkIdVL_TrkIsoVL_v",
 		    ),
 	    recMuonLabel  = cms.string("muons"),
-	    recElecLabel  = cms.string("gsfElectrons"),
+	    recElecLabel  = cms.string("gedGsfElectrons"),
 	    # -- Analysis specific cuts
 	    minCandidates = cms.uint32(2),
 	    ),
@@ -101,7 +101,7 @@
 		    "HLT_Ele17_CaloIdT_CaloIsoVL_TrkIdVL_TrkIsoVL_Ele8_CaloIdT_CaloIsoVL_TrkIdVL_TrkIsoVL_v",
 		    ),
 	    recMuonLabel  = cms.string("muons"),
-	    recElecLabel  = cms.string("gsfElectrons"),
+	    recElecLabel  = cms.string("gedGsfElectrons"),
 	    #recTrackLabel = cms.string("globalMuons"),
 	    # -- Analysis specific cuts
 	    minCandidates = cms.uint32(4), 
@@ -134,7 +134,7 @@
 		    ),
 	    recPFTauLabel  = cms.string("hpsPFTauProducer"),
 	    recMuonLabel   = cms.string("muons"),
-	    recElecLabel   = cms.string("gsfElectrons"),
+	    recElecLabel   = cms.string("gedGsfElectrons"),
 	    # -- Analysis specific cuts
 	    minCandidates = cms.uint32(2), 
 	    ),

diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_cff.py
@@ -48,7 +48,7 @@
             reco_ptMuonMin = cms.double(10.0),
             reco_ptPhotMin = cms.double(0.0),
             calomet = cms.string('met'),
-            electrons = cms.string('gsfElectrons')
+            electrons = cms.string('gedGsfElectrons')
         )
     ),
 
@@ -324,7 +324,7 @@
         def_muonPtMin = cms.double(7.0),
         def_photonPtMin = cms.double(30.0),
         calomet = cms.string('met'),
-        electrons = cms.string('gsfElectrons'),
+        electrons = cms.string('gedGsfElectrons'),
         jets = cms.string('iterativeCone5CaloJets'),
         muons = cms.string('muons'),
         def_jetPtMin = cms.double(30.0),

diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_fastSim_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_fastSim_cff.py
@@ -48,7 +48,7 @@
             reco_ptMuonMin = cms.double(10.0),
             reco_ptPhotMin = cms.double(0.0),
             calomet = cms.string('met'),
-            electrons = cms.string('gsfElectrons')
+            electrons = cms.string('gedGsfElectrons')
         )
     ),         
     # if mc_flag = false the McSelection folder will contain empty histograms
@@ -322,7 +322,7 @@
         def_muonPtMin = cms.double(7.0),
         def_photonPtMin = cms.double(30.0),
         calomet = cms.string('met'),
-        electrons = cms.string('gsfElectrons'),
+        electrons = cms.string('gedGsfElectrons'),
         jets = cms.string('iterativeCone5CaloJets'),
         muons = cms.string('muons'),
         def_jetPtMin = cms.double(30.0),

diff --git a/HLTriggerOffline/Top/python/singletopHLTEventDQM_cfi.py b/HLTriggerOffline/Top/python/singletopHLTEventDQM_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("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -172,7 +172,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")

diff --git a/HLTriggerOffline/Top/python/topDiLeptonHLTEventDQM_cfi.py b/HLTriggerOffline/Top/python/topDiLeptonHLTEventDQM_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("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -173,7 +173,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -328,7 +328,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -447,7 +447,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)
@@ -487,7 +487,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet")
     ),
@@ -613,7 +613,7 @@
     ),
     cms.PSet(
       label = cms.string("elecs:step2"),
-      src   = cms.InputTag("gsfElectrons"),
+      src   = cms.InputTag("gedGsfElectrons"),
       electronId = cms.PSet(
         src = cms.InputTag("simpleEleId70cIso"),
         pattern = cms.int32(1)

diff --git a/HLTriggerOffline/Top/python/topSingleLeptonHLTEventDQM_cfi.py b/HLTriggerOffline/Top/python/topSingleLeptonHLTEventDQM_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("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -149,7 +149,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       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("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -502,7 +502,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -612,7 +612,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) ),
       select = cms.string("pt>15 & abs(eta)<2.5"),
       min    = cms.int32(1),
@@ -679,7 +679,7 @@
     ## [mandatory]
     sources = cms.PSet(
       muons = cms.InputTag("muons"),
-      elecs = cms.InputTag("gsfElectrons"),
+      elecs = cms.InputTag("gedGsfElectrons"),
       jets  = cms.InputTag("ak5CaloJets"),
       mets  = cms.VInputTag("met", "tcMet", "pfMet"),
       pvs   = cms.InputTag("offlinePrimaryVertices")
@@ -789,7 +789,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) ),
       select = cms.string("pt>25 & abs(eta)<2.5 & (dr03TkSumPt+dr03EcalRecHitSumEt+dr03HcalTowerSumEt)/pt<0.1"),
       min = cms.int32(1),

diff --git a/HLTriggerOffline/Top/python/topvalidation_cfi.py b/HLTriggerOffline/Top/python/topvalidation_cfi.py
@@ -12,6 +12,6 @@
     OutputFileName = cms.string(''),
   #  DQMFolder = cms.untracked.string("HLT/Top")
     FolderName = cms.string("HLT/Top/"),
-    offlineElectrons = cms.InputTag('gsfElectrons')
+    offlineElectrons = cms.InputTag('gedGsfElectrons')
 
  )
diff --git a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h
@@ -39,8 +39,11 @@ The following classes of "interesting id" are considered
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 
+#include "DataFormats/Common/interface/View.h"
+
 class CaloTopology;
 class EcalSeverityLevelAlgo;
 
@@ -55,7 +58,7 @@ class InterestingDetIdCollectionProducer : public edm::EDProducer {
    private:
       // ----------member data ---------------------------
       edm::EDGetTokenT<EcalRecHitCollection>         recHitsToken_;
-      edm::EDGetTokenT<reco::BasicClusterCollection> basicClustersToken_;
+      edm::EDGetTokenT<edm::View<reco::CaloCluster> > basicClustersToken_;
       std::string interestingDetIdCollection_;
       int minimalEtaSize_;
       int minimalPhiSize_;

diff --git a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py
@@ -27,8 +27,6 @@
     MinTrackPt      = cms.double(50.0)
 )
 
-
-
 reducedEcalRecHitsEB = cms.EDProducer("ReducedRecHitCollectionProducer",
     recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"),
     interestingDetIdCollections = cms.VInputTag(
@@ -39,10 +37,7 @@
             cms.InputTag("interestingEleIsoDetIdEB"),
             cms.InputTag("interestingGamIsoDetIdEB"),
             # tau
-            #cms.InputTag("caloRecoTauProducer"),
-            #pf
-            cms.InputTag("pfElectronInterestingEcalDetIdEB"),
-            cms.InputTag("pfPhotonInterestingEcalDetIdEB"),
+            #cms.InputTag("caloRecoTauProducer"),            
             # muons
             cms.InputTag("muonEcalDetIds"),
             # high pt tracks
@@ -60,10 +55,7 @@
             cms.InputTag("interestingEleIsoDetIdEE"),
             cms.InputTag("interestingGamIsoDetIdEE"),
             # tau
-            #cms.InputTag("caloRecoTauProducer"),
-            #pf
-            cms.InputTag("pfElectronInterestingEcalDetIdEE"),
-            cms.InputTag("pfPhotonInterestingEcalDetIdEE"),
+            #cms.InputTag("caloRecoTauProducer"),            
             # muons
             cms.InputTag("muonEcalDetIds"),
             # high pt tracks
@@ -75,7 +67,8 @@
 reducedEcalRecHitsES = cms.EDProducer("ReducedESRecHitCollectionProducer",
                                       scEtThreshold = cms.double(15),
                                       EcalRecHitCollectionES = cms.InputTag('ecalPreshowerRecHit','EcalRecHitsES'),
-                                      EndcapSuperClusterCollection = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower'),
+                                      EndcapSuperClusterCollection = cms.InputTag("particleFlowSuperClusterECAL",
+                                      "particleFlowSuperClusterECALEndcapWithPreshower"),
                                       OutputLabel_ES = cms.string(''),
                                       interestingDetIds = cms.VInputTag()
                                       )

diff --git a/RecoEcal/EgammaClusterProducers/src/InterestingDetIdCollectionProducer.cc b/RecoEcal/EgammaClusterProducers/src/InterestingDetIdCollectionProducer.cc
@@ -26,7 +26,7 @@ InterestingDetIdCollectionProducer::InterestingDetIdCollectionProducer(const edm
   recHitsToken_ = 
 	  consumes<EcalRecHitCollection>(iConfig.getParameter< edm::InputTag > ("recHitsLabel"));
   basicClustersToken_ = 
-	  consumes<reco::BasicClusterCollection>(iConfig.getParameter< edm::InputTag >("basicClustersLabel"));
+    consumes<edm::View<reco::CaloCluster> >(iConfig.getParameter< edm::InputTag >("basicClustersLabel"));
 
   interestingDetIdCollection_ = iConfig.getParameter<std::string>("interestingDetIdCollection");
 
@@ -64,8 +64,8 @@ InterestingDetIdCollectionProducer::produce (edm::Event& iEvent,
    using namespace std;
 
    // take BasicClusters
-  Handle<reco::BasicClusterCollection> pClusters;
-  iEvent.getByToken(basicClustersToken_, pClusters);
+   Handle<edm::View<reco::CaloCluster> > pClusters;
+   iEvent.getByToken(basicClustersToken_, pClusters);
 
   // take EcalRecHits
   Handle<EcalRecHitCollection> recHitsHandle;
@@ -75,7 +75,7 @@ InterestingDetIdCollectionProducer::produce (edm::Event& iEvent,
   std::vector<DetId> indexToStore;
   indexToStore.reserve(1000);
 
-  reco::BasicClusterCollection::const_iterator clusIt;
+  edm::View<reco::CaloCluster>::const_iterator clusIt;
 
   std::vector<DetId> xtalsToStore;
   xtalsToStore.reserve(50);

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(gsfElectronMergingSequence*interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)
+egammaHighLevelRecoPostPF = cms.Sequence(interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)
 
 
 egammarecoFull = cms.Sequence(egammareco*interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence)