diff --git a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_cff.py b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_cff.py index b9078d4addfd4..aaaeb05a9907e 100644 --- a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_cff.py +++ b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_cff.py @@ -17,7 +17,7 @@ # you should not need to uncomment those, because I've already # produced them in the ALCARECO step #trackerDrivenOnlyElectrons = cms.EDFilter("GsfElectronRefSelector", -# src = cms.InputTag( 'gsfElectrons' ), +# src = cms.InputTag( 'gedGsfElectrons' ), # cut = cms.string( "(ecalDrivenSeed==0)" ) # ) diff --git a/Calibration/EcalAlCaRecoProducers/python/alCaIsolatedElectrons_cfi.py b/Calibration/EcalAlCaRecoProducers/python/alCaIsolatedElectrons_cfi.py index 6980dcd16d71e..2244fde2b69f5 100644 --- a/Calibration/EcalAlCaRecoProducers/python/alCaIsolatedElectrons_cfi.py +++ b/Calibration/EcalAlCaRecoProducers/python/alCaIsolatedElectrons_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms alCaIsolatedElectrons = cms.EDProducer("AlCaECALRecHitReducer", - electronLabel = cms.InputTag("gsfElectrons"), + electronLabel = cms.InputTag("gedGsfElectrons"), alcaEndcapHitCollection = cms.string('alcaEndcapHits'), phiSize = cms.int32(11), etaSize = cms.int32(5), diff --git a/Calibration/EcalAlCaRecoProducers/python/alcastreamElectronOutput_cff.py b/Calibration/EcalAlCaRecoProducers/python/alcastreamElectronOutput_cff.py index d0ee81861ccab..99e256673b25c 100644 --- a/Calibration/EcalAlCaRecoProducers/python/alcastreamElectronOutput_cff.py +++ b/Calibration/EcalAlCaRecoProducers/python/alcastreamElectronOutput_cff.py @@ -9,7 +9,7 @@ SelectEvents = cms.vstring('pathAlcastreamElectron') ), outputCommands = cms.untracked.vstring('drop *', - 'keep TrackCandidates_gsfElectrons_*_*', + 'keep TrackCandidates_gedGsfElectrons_*_*', 'keep *_electronFilter_*_*', 'keep *_alCaIsolatedElectrons_*_*') ) diff --git a/Calibration/EcalAlCaRecoProducers/python/alcastreamElectron_cff.py b/Calibration/EcalAlCaRecoProducers/python/alcastreamElectron_cff.py index 32938796a5ebf..a8289a0e32225 100644 --- a/Calibration/EcalAlCaRecoProducers/python/alcastreamElectron_cff.py +++ b/Calibration/EcalAlCaRecoProducers/python/alcastreamElectron_cff.py @@ -14,7 +14,7 @@ from Calibration.EcalAlCaRecoProducers.alCaIsolatedElectrons_cfi import * electronFilter = cms.EDFilter("EtaPtMinGsfElectronFullCloneSelector", filter = cms.bool(True), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), etaMin = cms.double(-2.7), etaMax = cms.double(2.7), ptMin = cms.double(5.0) diff --git a/Calibration/EcalAlCaRecoProducers/python/electronFilter_cfi.py b/Calibration/EcalAlCaRecoProducers/python/electronFilter_cfi.py index e8bb25844963e..73a49332da116 100644 --- a/Calibration/EcalAlCaRecoProducers/python/electronFilter_cfi.py +++ b/Calibration/EcalAlCaRecoProducers/python/electronFilter_cfi.py @@ -2,7 +2,7 @@ electronFilter = cms.EDFilter("EtaPtMinGsfElectronFullCloneSelector", filter = cms.bool(True), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), etaMin = cms.double(-2.5), etaMax = cms.double(2.5), ptMin = cms.double(15.0) diff --git a/Configuration/Skimming/python/PDWG_EXOHPTE_cff.py b/Configuration/Skimming/python/PDWG_EXOHPTE_cff.py index bb5765d4528c9..4f3741135001e 100644 --- a/Configuration/Skimming/python/PDWG_EXOHPTE_cff.py +++ b/Configuration/Skimming/python/PDWG_EXOHPTE_cff.py @@ -12,7 +12,7 @@ #Define the Reco quality cut exoticaRecoDiHPTEFilter = cms.EDFilter( "PtMinGsfElectronCountFilter", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), ptMin = cms.double(30.0), minNumber = cms.uint32(2) ) diff --git a/Configuration/Skimming/python/PDWG_HWWSkim_cff.py b/Configuration/Skimming/python/PDWG_HWWSkim_cff.py index c548292c4ad55..025a2e759aafc 100644 --- a/Configuration/Skimming/python/PDWG_HWWSkim_cff.py +++ b/Configuration/Skimming/python/PDWG_HWWSkim_cff.py @@ -12,7 +12,7 @@ goodHwwElectrons = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string( "pt > 10 &&" + " abs(deltaEtaSuperClusterTrackAtVtx) < 0.010 &&" + " (( isEB && sigmaIetaIeta < 0.011) ||" + diff --git a/Configuration/Skimming/python/PDWG_HZZSkim_cff.py b/Configuration/Skimming/python/PDWG_HZZSkim_cff.py index 3db109b373df0..3e00950ba6aad 100644 --- a/Configuration/Skimming/python/PDWG_HZZSkim_cff.py +++ b/Configuration/Skimming/python/PDWG_HZZSkim_cff.py @@ -13,7 +13,7 @@ cut = cms.string(MUON_CUT) ) goodHzzElectrons = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string(ELECTRON_CUT) ) diff --git a/Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py b/Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py index c8b7ca741a317..3f52bf42c6d3a 100644 --- a/Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py +++ b/Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py @@ -2,7 +2,7 @@ PdwgLeptonRecoSkim = cms.EDFilter('LeptonRecoSkim', HltLabel = cms.InputTag("TriggerResults","","HLT"), - electronCollection = cms.InputTag("gsfElectrons"), + electronCollection = cms.InputTag("gedGsfElectrons"), pfElectronCollection = cms.InputTag("particleFlow"), muonCollection = cms.InputTag("muons"), caloJetCollection = cms.InputTag("ak5CaloJetsL2L3"), diff --git a/DPGAnalysis/Skims/python/JetPDSkim_cfg.py b/DPGAnalysis/Skims/python/JetPDSkim_cfg.py index 65a581d1e762c..8194cc18dee01 100644 --- a/DPGAnalysis/Skims/python/JetPDSkim_cfg.py +++ b/DPGAnalysis/Skims/python/JetPDSkim_cfg.py @@ -137,7 +137,7 @@ SelectEvents = cms.untracked.PSet( SelectEvents = cms.vstring('pathlogerror') ), - outputCommands = (cms.untracked.vstring('drop *', 'drop *', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'drop *_hlt*_*_*', 'keep *_hltL1GtObjectMap_*_*', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'keep edmTriggerResults_*_*_*', 'keep triggerTriggerEvent_*_*_*', 'keep DetIdedmEDCollection_siStripDigis_*_*', 'keep *_siPixelClusters_*_*', 'keep *_siStripClusters_*_*', 'keep *_dt1DRecHits_*_*', 'keep *_dt4DSegments_*_*', 'keep *_csc2DRecHits_*_*', 'keep *_cscSegments_*_*', 'keep *_rpcRecHits_*_*', 'keep *_hbhereco_*_*', 'keep *_hfreco_*_*', 'keep *_horeco_*_*', 'keep HBHERecHitsSorted_hbherecoMB_*_*', 'keep HORecHitsSorted_horecoMB_*_*', 'keep HFRecHitsSorted_hfrecoMB_*_*', 'keep ZDCDataFramesSorted_*Digis_*_*', 'keep ZDCRecHitsSorted_*_*_*', 'keep *_castorreco_*_*', 'keep *_CastorTowerReco_*_*', 'keep *_CastorClusterRecoAntiKt07_*_*', 'keep *_CastorJetEgammaRecoAntiKt07_*_*', 'keep *_ecalPreshowerRecHit_*_*', 'keep *_ecalRecHit_*_*', 'keep EBSrFlagsSorted_ecalDigis_*_*', 'keep EESrFlagsSorted_ecalDigis_*_*', 'keep *_selectDigi_*_*', 'keep EcalRecHitsSorted_reducedEcalRecHits*_*_*', 'keep *_hybridSuperClusters_*_*', 'keep *_uncleanedHybridSuperClusters_*_*', 'keep recoSuperClusters_correctedHybridSuperClusters_*_*', 'keep *_multi5x5BasicClusters_*_*', 'keep recoSuperClusters_multi5x5SuperClusters_*_*', 'keep recoSuperClusters_multi5x5SuperClustersWithPreshower_*_*', 'keep recoSuperClusters_correctedMulti5x5SuperClustersWithPreshower_*_*', 'keep recoPreshowerClusters_multi5x5SuperClustersWithPreshower_*_*', 'keep recoPreshowerClusterShapes_multi5x5PreshowerClusterShape_*_*', 'drop recoClusterShapes_*_*_*', 'drop recoBasicClustersToOnerecoClusterShapesAssociation_*_*_*', 'drop recoBasicClusters_multi5x5BasicClusters_multi5x5BarrelBasicClusters_*', 'drop recoSuperClusters_multi5x5SuperClusters_multi5x5BarrelSuperClusters_*', 'keep *_CkfElectronCandidates_*_*', 'keep *_GsfGlobalElectronTest_*_*', 'keep *_electronMergedSeeds_*_*', 'keep recoGsfTracks_electronGsfTracks_*_*', 'keep recoGsfTrackExtras_electronGsfTracks_*_*', 'keep recoTrackExtras_electronGsfTracks_*_*', 'keep TrackingRecHitsOwned_electronGsfTracks_*_*', 'keep recoTracks_generalTracks_*_*', 'keep recoTrackExtras_generalTracks_*_*', 'keep TrackingRecHitsOwned_generalTracks_*_*', 'keep recoTracks_beamhaloTracks_*_*', 'keep recoTrackExtras_beamhaloTracks_*_*', 'keep TrackingRecHitsOwned_beamhaloTracks_*_*', 'keep recoTracks_regionalCosmicTracks_*_*', 'keep recoTrackExtras_regionalCosmicTracks_*_*', 'keep TrackingRecHitsOwned_regionalCosmicTracks_*_*', 'keep recoTracks_rsWithMaterialTracks_*_*', 'keep recoTrackExtras_rsWithMaterialTracks_*_*', 'keep TrackingRecHitsOwned_rsWithMaterialTracks_*_*', 'keep *_ctfPixelLess_*_*', 'keep *_dedxTruncated40_*_*', 'keep *_dedxMedian_*_*', 'keep *_dedxHarmonic2_*_*', 'keep *_kt4CaloJets_*_*', 'keep *_kt6CaloJets_*_*', 'keep *_ak5CaloJets_*_*', 'keep *_ak7CaloJets_*_*', 'keep *_iterativeCone5CaloJets_*_*', 'keep *_iterativeCone15CaloJets_*_*', 'keep *_kt4PFJets_*_*', 'keep *_kt6PFJets_*_*', 'keep *_ak5PFJets_*_*', 'keep *_ak7PFJets_*_*', 'keep *_iterativeCone5PFJets_*_*', 'keep *_JetPlusTrackZSPCorJetAntiKt5_*_*', 'keep *_ak5TrackJets_*_*', 'keep *_kt4TrackJets_*_*', 'keep recoRecoChargedRefCandidates_trackRefsForJets_*_*', 'keep *_caloTowers_*_*', 'keep *_towerMaker_*_*', 'keep *_ic5JetTracksAssociatorAtVertex_*_*', 'keep *_iterativeCone5JetTracksAssociatorAtVertex_*_*', 'keep *_iterativeCone5JetTracksAssociatorAtCaloFace_*_*', 'keep *_iterativeCone5JetExtender_*_*', 'keep *_kt4JetTracksAssociatorAtVertex_*_*', 'keep *_kt4JetTracksAssociatorAtCaloFace_*_*', 'keep *_kt4JetExtender_*_*', 'keep *_ak5JetTracksAssociatorAtVertex_*_*', 'keep *_ak5JetTracksAssociatorAtCaloFace_*_*', 'keep *_ak5JetExtender_*_*', 'keep *_ak7JetTracksAssociatorAtVertex_*_*', 'keep *_ak7JetTracksAssociatorAtCaloFace_*_*', 'keep *_ak7JetExtender_*_*', 'keep *_ak5JetID_*_*', 'keep *_ak7JetID_*_*', 'keep *_ic5JetID_*_*', 'keep *_kt4JetID_*_*', 'keep *_kt6JetID_*_*', 'keep *_trackExtrapolator_*_*', 'keep recoCaloMETs_*_*_*', 'keep recoMETs_*_*_*', 'keep recoPFMETs_*_*_*', 'keep recoMuonMETCorrectionDataedmValueMap_*_*_*', 'keep recoHcalNoiseRBXs_*_*_*', 'keep HcalNoiseSummary_*_*_*', 'keep *HaloData_*_*_*', 'keep *BeamHaloSummary_*_*_*', 'keep *_MuonSeed_*_*', 'keep *_ancientMuonSeed_*_*', 'keep *_mergedStandAloneMuonSeeds_*_*', 'keep TrackingRecHitsOwned_globalMuons_*_*', 'keep TrackingRecHitsOwned_tevMuons_*_*', 'keep recoCaloMuons_calomuons_*_*', 'keep *_CosmicMuonSeed_*_*', 'keep recoTrackExtras_cosmicMuons_*_*', 'keep TrackingRecHitsOwned_cosmicMuons_*_*', 'keep recoTrackExtras_globalCosmicMuons_*_*', 'keep TrackingRecHitsOwned_globalCosmicMuons_*_*', 'keep recoTrackExtras_cosmicMuons1Leg_*_*', 'keep TrackingRecHitsOwned_cosmicMuons1Leg_*_*', 'keep recoTrackExtras_globalCosmicMuons1Leg_*_*', 'keep TrackingRecHitsOwned_globalCosmicMuons1Leg_*_*', 'keep recoTracks_cosmicsVetoTracks_*_*', '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_standAloneMuons_*_*', 'keep recoTrackExtras_standAloneMuons_*_*', 'keep TrackingRecHitsOwned_standAloneMuons_*_*', 'keep recoTracks_globalMuons_*_*', 'keep recoTrackExtras_globalMuons_*_*', 'keep recoTracks_tevMuons_*_*', 'keep recoTrackExtras_tevMuons_*_*', 'keep recoTracksToOnerecoTracksAssociation_tevMuons_*_*', 'keep recoTracks_generalTracks_*_*', 'keep recoMuons_muons_*_*', 'keep booledmValueMap_muid*_*_*', 'keep recoMuonTimeExtraedmValueMap_muons_*_*', 'keep recoTracks_cosmicMuons_*_*', 'keep recoTracks_globalCosmicMuons_*_*', 'keep recoMuons_muonsFromCosmics_*_*', 'keep recoTracks_cosmicMuons1Leg_*_*', 'keep recoTracks_globalCosmicMuons1Leg_*_*', 'keep recoMuons_muonsFromCosmics1Leg_*_*', 'keep recoMuonCosmicCompatibilityedmValueMap_cosmicsVeto_*_*', 'keep uintedmValueMap_cosmicsVeto_*_*', 'keep *_muIsoDepositTk_*_*', 'keep *_muIsoDepositCalByAssociatorTowers_*_*', 'keep *_muIsoDepositCalByAssociatorHits_*_*', 'keep *_muIsoDepositJets_*_*', 'keep *_muGlobalIsoDepositCtfTk_*_*', 'keep *_muGlobalIsoDepositCalByAssociatorTowers_*_*', 'keep *_muGlobalIsoDepositCalByAssociatorHits_*_*', 'keep *_muGlobalIsoDepositJets_*_*', 'keep *_impactParameterTagInfos_*_*', 'keep *_trackCountingHighEffBJetTags_*_*', 'keep *_trackCountingHighPurBJetTags_*_*', 'keep *_jetProbabilityBJetTags_*_*', 'keep *_jetBProbabilityBJetTags_*_*', 'keep *_secondaryVertexTagInfos_*_*', 'keep *_ghostTrackVertexTagInfos_*_*', 'keep *_simpleSecondaryVertexBJetTags_*_*', 'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', 'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', 'keep *_combinedSecondaryVertexBJetTags_*_*', 'keep *_combinedSecondaryVertexMVABJetTags_*_*', 'keep *_ghostTrackBJetTags_*_*', 'keep *_btagSoftElectrons_*_*', 'keep *_softElectronCands_*_*', 'keep *_softPFElectrons_*_*', 'keep *_softElectronTagInfos_*_*', 'keep *_softElectronBJetTags_*_*', 'keep *_softElectronByIP3dBJetTags_*_*', 'keep *_softElectronByPtBJetTags_*_*', 'keep *_softMuonTagInfos_*_*', 'keep *_softMuonBJetTags_*_*', 'keep *_softMuonByIP3dBJetTags_*_*', 'keep *_softMuonByPtBJetTags_*_*', 'keep *_combinedMVABJetTags_*_*', 'keep *_pfRecoTauTagInfoProducer_*_*', 'keep *_fixedConePFTauProducer*_*_*', 'keep *_fixedConePFTauDiscrimination*_*_*', 'keep *_hpsPFTauProducer*_*_*', 'keep *_hpsPFTauDiscrimination*_*_*', 'keep *_shrinkingConePFTauProducer*_*_*', 'keep *_shrinkingConePFTauDecayModeIndexProducer*_*_*', 'keep *_shrinkingConePFTauDiscrimination*_*_*', 'keep *_TCTauJetPlusTrackZSPCorJetAntiKt5_*_*', 'keep *_caloRecoTauTagInfoProducer_*_*', 'keep recoCaloTaus_caloRecoTauProducer*_*_*', 'keep *_caloRecoTauDiscrimination*_*_*', 'keep *_offlinePrimaryVertices_*_*', 'keep *_offlinePrimaryVerticesWithBS_*_*', 'keep *_offlinePrimaryVerticesFromCosmicTracks_*_*', 'keep *_nuclearInteractionMaker_*_*', 'keep *_generalV0Candidates_*_*', 'keep recoGsfElectronCores_gsfElectronCores_*_*', 'keep recoGsfElectrons_gsfElectrons_*_*', 'keep floatedmValueMap_eidRobustLoose_*_*', 'keep floatedmValueMap_eidRobustTight_*_*', 'keep floatedmValueMap_eidRobustHighEnergy_*_*', 'keep floatedmValueMap_eidLoose_*_*', 'keep floatedmValueMap_eidTight_*_*', 'keep recoPhotons_photons_*_*', 'keep recoPhotonCores_photonCore_*_*', 'keep recoConversions_conversions_*_*', 'drop *_conversions_uncleanedConversions_*', 'keep recoConversions_trackerOnlyConversions_*_*', 'keep recoTracks_ckfOutInTracksFromConversions_*_*', 'keep recoTracks_ckfInOutTracksFromConversions_*_*', 'keep recoTrackExtras_ckfOutInTracksFromConversions_*_*', 'keep recoTrackExtras_ckfInOutTracksFromConversions_*_*', 'keep TrackingRecHitsOwned_ckfOutInTracksFromConversions_*_*', 'keep TrackingRecHitsOwned_ckfInOutTracksFromConversions_*_*', 'keep *_PhotonIDProd_*_*', 'keep *_hfRecoEcalCandidate_*_*', 'keep *_hfEMClusters_*_*', 'keep *_pixelTracks_*_*', 'keep *_pixelVertices_*_*', 'drop CaloTowersSorted_towerMakerPF_*_*', 'keep recoPFRecHits_*_Cleaned_*', 'keep recoPFClusters_*_*_*', 'keep recoPFBlocks_*_*_*', 'keep recoPFCandidates_*_*_*', 'keep recoPFDisplacedVertexs_*_*_*', 'keep *_pfElectronTranslator_*_*', 'keep *_trackerDrivenElectronSeeds_preid_*', 'keep *_offlineBeamSpot_*_*', 'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*', 'keep *_l1GtRecord_*_*', 'keep *_l1GtTriggerMenuLite_*_*', 'keep *_conditionsInEdm_*_*', 'keep *_l1extraParticles_*_*', 'keep L1MuGMTReadoutCollection_gtDigis_*_*', 'keep L1GctEmCand*_gctDigis_*_*', 'keep L1GctJetCand*_gctDigis_*_*', 'keep L1GctEtHad*_gctDigis_*_*', 'keep L1GctEtMiss*_gctDigis_*_*', 'keep L1GctEtTotal*_gctDigis_*_*')+cms.untracked.vstring('keep L1GctHtMiss*_gctDigis_*_*', 'keep L1GctJetCounts*_gctDigis_*_*', 'keep L1GctHFRingEtSums*_gctDigis_*_*', 'keep L1GctHFBitCounts*_gctDigis_*_*', 'keep LumiDetails_lumiProducer_*_*', 'keep LumiSummary_lumiProducer_*_*', 'drop *_hlt*_*_*', 'keep *_hltL1GtObjectMap_*_*', 'keep edmTriggerResults_*_*_*', 'keep triggerTriggerEvent_*_*_*', 'keep *_MEtoEDMConverter_*_*', 'keep L1AcceptBunchCrossings_*_*_*', 'keep L1TriggerScalerss_*_*_*', 'keep Level1TriggerScalerss_*_*_*', 'keep LumiScalerss_*_*_*', 'keep BeamSpotOnlines_*_*_*', 'keep DcsStatuss_*_*_*', 'keep *_logErrorHarvester_*_*', 'drop *_MEtoEDMConverter_*_*', 'drop *_*_*_SKIM')), + outputCommands = (cms.untracked.vstring('drop *', 'drop *', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'drop *_hlt*_*_*', 'keep *_hltL1GtObjectMap_*_*', 'keep FEDRawDataCollection_rawDataCollector_*_*', 'keep FEDRawDataCollection_source_*_*', 'keep edmTriggerResults_*_*_*', 'keep triggerTriggerEvent_*_*_*', 'keep DetIdedmEDCollection_siStripDigis_*_*', 'keep *_siPixelClusters_*_*', 'keep *_siStripClusters_*_*', 'keep *_dt1DRecHits_*_*', 'keep *_dt4DSegments_*_*', 'keep *_csc2DRecHits_*_*', 'keep *_cscSegments_*_*', 'keep *_rpcRecHits_*_*', 'keep *_hbhereco_*_*', 'keep *_hfreco_*_*', 'keep *_horeco_*_*', 'keep HBHERecHitsSorted_hbherecoMB_*_*', 'keep HORecHitsSorted_horecoMB_*_*', 'keep HFRecHitsSorted_hfrecoMB_*_*', 'keep ZDCDataFramesSorted_*Digis_*_*', 'keep ZDCRecHitsSorted_*_*_*', 'keep *_castorreco_*_*', 'keep *_CastorTowerReco_*_*', 'keep *_CastorClusterRecoAntiKt07_*_*', 'keep *_CastorJetEgammaRecoAntiKt07_*_*', 'keep *_ecalPreshowerRecHit_*_*', 'keep *_ecalRecHit_*_*', 'keep EBSrFlagsSorted_ecalDigis_*_*', 'keep EESrFlagsSorted_ecalDigis_*_*', 'keep *_selectDigi_*_*', 'keep EcalRecHitsSorted_reducedEcalRecHits*_*_*', 'keep *_hybridSuperClusters_*_*', 'keep *_uncleanedHybridSuperClusters_*_*', 'keep recoSuperClusters_correctedHybridSuperClusters_*_*', 'keep *_multi5x5BasicClusters_*_*', 'keep recoSuperClusters_multi5x5SuperClusters_*_*', 'keep recoSuperClusters_multi5x5SuperClustersWithPreshower_*_*', 'keep recoSuperClusters_correctedMulti5x5SuperClustersWithPreshower_*_*', 'keep recoPreshowerClusters_multi5x5SuperClustersWithPreshower_*_*', 'keep recoPreshowerClusterShapes_multi5x5PreshowerClusterShape_*_*', 'drop recoClusterShapes_*_*_*', 'drop recoBasicClustersToOnerecoClusterShapesAssociation_*_*_*', 'drop recoBasicClusters_multi5x5BasicClusters_multi5x5BarrelBasicClusters_*', 'drop recoSuperClusters_multi5x5SuperClusters_multi5x5BarrelSuperClusters_*', 'keep *_CkfElectronCandidates_*_*', 'keep *_GsfGlobalElectronTest_*_*', 'keep *_electronMergedSeeds_*_*', 'keep recoGsfTracks_electronGsfTracks_*_*', 'keep recoGsfTrackExtras_electronGsfTracks_*_*', 'keep recoTrackExtras_electronGsfTracks_*_*', 'keep TrackingRecHitsOwned_electronGsfTracks_*_*', 'keep recoTracks_generalTracks_*_*', 'keep recoTrackExtras_generalTracks_*_*', 'keep TrackingRecHitsOwned_generalTracks_*_*', 'keep recoTracks_beamhaloTracks_*_*', 'keep recoTrackExtras_beamhaloTracks_*_*', 'keep TrackingRecHitsOwned_beamhaloTracks_*_*', 'keep recoTracks_regionalCosmicTracks_*_*', 'keep recoTrackExtras_regionalCosmicTracks_*_*', 'keep TrackingRecHitsOwned_regionalCosmicTracks_*_*', 'keep recoTracks_rsWithMaterialTracks_*_*', 'keep recoTrackExtras_rsWithMaterialTracks_*_*', 'keep TrackingRecHitsOwned_rsWithMaterialTracks_*_*', 'keep *_ctfPixelLess_*_*', 'keep *_dedxTruncated40_*_*', 'keep *_dedxMedian_*_*', 'keep *_dedxHarmonic2_*_*', 'keep *_kt4CaloJets_*_*', 'keep *_kt6CaloJets_*_*', 'keep *_ak5CaloJets_*_*', 'keep *_ak7CaloJets_*_*', 'keep *_iterativeCone5CaloJets_*_*', 'keep *_iterativeCone15CaloJets_*_*', 'keep *_kt4PFJets_*_*', 'keep *_kt6PFJets_*_*', 'keep *_ak5PFJets_*_*', 'keep *_ak7PFJets_*_*', 'keep *_iterativeCone5PFJets_*_*', 'keep *_JetPlusTrackZSPCorJetAntiKt5_*_*', 'keep *_ak5TrackJets_*_*', 'keep *_kt4TrackJets_*_*', 'keep recoRecoChargedRefCandidates_trackRefsForJets_*_*', 'keep *_caloTowers_*_*', 'keep *_towerMaker_*_*', 'keep *_ic5JetTracksAssociatorAtVertex_*_*', 'keep *_iterativeCone5JetTracksAssociatorAtVertex_*_*', 'keep *_iterativeCone5JetTracksAssociatorAtCaloFace_*_*', 'keep *_iterativeCone5JetExtender_*_*', 'keep *_kt4JetTracksAssociatorAtVertex_*_*', 'keep *_kt4JetTracksAssociatorAtCaloFace_*_*', 'keep *_kt4JetExtender_*_*', 'keep *_ak5JetTracksAssociatorAtVertex_*_*', 'keep *_ak5JetTracksAssociatorAtCaloFace_*_*', 'keep *_ak5JetExtender_*_*', 'keep *_ak7JetTracksAssociatorAtVertex_*_*', 'keep *_ak7JetTracksAssociatorAtCaloFace_*_*', 'keep *_ak7JetExtender_*_*', 'keep *_ak5JetID_*_*', 'keep *_ak7JetID_*_*', 'keep *_ic5JetID_*_*', 'keep *_kt4JetID_*_*', 'keep *_kt6JetID_*_*', 'keep *_trackExtrapolator_*_*', 'keep recoCaloMETs_*_*_*', 'keep recoMETs_*_*_*', 'keep recoPFMETs_*_*_*', 'keep recoMuonMETCorrectionDataedmValueMap_*_*_*', 'keep recoHcalNoiseRBXs_*_*_*', 'keep HcalNoiseSummary_*_*_*', 'keep *HaloData_*_*_*', 'keep *BeamHaloSummary_*_*_*', 'keep *_MuonSeed_*_*', 'keep *_ancientMuonSeed_*_*', 'keep *_mergedStandAloneMuonSeeds_*_*', 'keep TrackingRecHitsOwned_globalMuons_*_*', 'keep TrackingRecHitsOwned_tevMuons_*_*', 'keep recoCaloMuons_calomuons_*_*', 'keep *_CosmicMuonSeed_*_*', 'keep recoTrackExtras_cosmicMuons_*_*', 'keep TrackingRecHitsOwned_cosmicMuons_*_*', 'keep recoTrackExtras_globalCosmicMuons_*_*', 'keep TrackingRecHitsOwned_globalCosmicMuons_*_*', 'keep recoTrackExtras_cosmicMuons1Leg_*_*', 'keep TrackingRecHitsOwned_cosmicMuons1Leg_*_*', 'keep recoTrackExtras_globalCosmicMuons1Leg_*_*', 'keep TrackingRecHitsOwned_globalCosmicMuons1Leg_*_*', 'keep recoTracks_cosmicsVetoTracks_*_*', '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_standAloneMuons_*_*', 'keep recoTrackExtras_standAloneMuons_*_*', 'keep TrackingRecHitsOwned_standAloneMuons_*_*', 'keep recoTracks_globalMuons_*_*', 'keep recoTrackExtras_globalMuons_*_*', 'keep recoTracks_tevMuons_*_*', 'keep recoTrackExtras_tevMuons_*_*', 'keep recoTracksToOnerecoTracksAssociation_tevMuons_*_*', 'keep recoTracks_generalTracks_*_*', 'keep recoMuons_muons_*_*', 'keep booledmValueMap_muid*_*_*', 'keep recoMuonTimeExtraedmValueMap_muons_*_*', 'keep recoTracks_cosmicMuons_*_*', 'keep recoTracks_globalCosmicMuons_*_*', 'keep recoMuons_muonsFromCosmics_*_*', 'keep recoTracks_cosmicMuons1Leg_*_*', 'keep recoTracks_globalCosmicMuons1Leg_*_*', 'keep recoMuons_muonsFromCosmics1Leg_*_*', 'keep recoMuonCosmicCompatibilityedmValueMap_cosmicsVeto_*_*', 'keep uintedmValueMap_cosmicsVeto_*_*', 'keep *_muIsoDepositTk_*_*', 'keep *_muIsoDepositCalByAssociatorTowers_*_*', 'keep *_muIsoDepositCalByAssociatorHits_*_*', 'keep *_muIsoDepositJets_*_*', 'keep *_muGlobalIsoDepositCtfTk_*_*', 'keep *_muGlobalIsoDepositCalByAssociatorTowers_*_*', 'keep *_muGlobalIsoDepositCalByAssociatorHits_*_*', 'keep *_muGlobalIsoDepositJets_*_*', 'keep *_impactParameterTagInfos_*_*', 'keep *_trackCountingHighEffBJetTags_*_*', 'keep *_trackCountingHighPurBJetTags_*_*', 'keep *_jetProbabilityBJetTags_*_*', 'keep *_jetBProbabilityBJetTags_*_*', 'keep *_secondaryVertexTagInfos_*_*', 'keep *_ghostTrackVertexTagInfos_*_*', 'keep *_simpleSecondaryVertexBJetTags_*_*', 'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', 'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', 'keep *_combinedSecondaryVertexBJetTags_*_*', 'keep *_combinedSecondaryVertexMVABJetTags_*_*', 'keep *_ghostTrackBJetTags_*_*', 'keep *_btagSoftElectrons_*_*', 'keep *_softElectronCands_*_*', 'keep *_softPFElectrons_*_*', 'keep *_softElectronTagInfos_*_*', 'keep *_softElectronBJetTags_*_*', 'keep *_softElectronByIP3dBJetTags_*_*', 'keep *_softElectronByPtBJetTags_*_*', 'keep *_softMuonTagInfos_*_*', 'keep *_softMuonBJetTags_*_*', 'keep *_softMuonByIP3dBJetTags_*_*', 'keep *_softMuonByPtBJetTags_*_*', 'keep *_combinedMVABJetTags_*_*', 'keep *_pfRecoTauTagInfoProducer_*_*', 'keep *_fixedConePFTauProducer*_*_*', 'keep *_fixedConePFTauDiscrimination*_*_*', 'keep *_hpsPFTauProducer*_*_*', 'keep *_hpsPFTauDiscrimination*_*_*', 'keep *_shrinkingConePFTauProducer*_*_*', 'keep *_shrinkingConePFTauDecayModeIndexProducer*_*_*', 'keep *_shrinkingConePFTauDiscrimination*_*_*', 'keep *_TCTauJetPlusTrackZSPCorJetAntiKt5_*_*', 'keep *_caloRecoTauTagInfoProducer_*_*', 'keep recoCaloTaus_caloRecoTauProducer*_*_*', 'keep *_caloRecoTauDiscrimination*_*_*', 'keep *_offlinePrimaryVertices_*_*', 'keep *_offlinePrimaryVerticesWithBS_*_*', 'keep *_offlinePrimaryVerticesFromCosmicTracks_*_*', 'keep *_nuclearInteractionMaker_*_*', 'keep *_generalV0Candidates_*_*', 'keep recoGsfElectronCores_gsfElectronCores_*_*', 'keep recoGsfElectrons_gedGsfElectrons_*_*', 'keep floatedmValueMap_eidRobustLoose_*_*', 'keep floatedmValueMap_eidRobustTight_*_*', 'keep floatedmValueMap_eidRobustHighEnergy_*_*', 'keep floatedmValueMap_eidLoose_*_*', 'keep floatedmValueMap_eidTight_*_*', 'keep recoPhotons_photons_*_*', 'keep recoPhotonCores_photonCore_*_*', 'keep recoConversions_conversions_*_*', 'drop *_conversions_uncleanedConversions_*', 'keep recoConversions_trackerOnlyConversions_*_*', 'keep recoTracks_ckfOutInTracksFromConversions_*_*', 'keep recoTracks_ckfInOutTracksFromConversions_*_*', 'keep recoTrackExtras_ckfOutInTracksFromConversions_*_*', 'keep recoTrackExtras_ckfInOutTracksFromConversions_*_*', 'keep TrackingRecHitsOwned_ckfOutInTracksFromConversions_*_*', 'keep TrackingRecHitsOwned_ckfInOutTracksFromConversions_*_*', 'keep *_PhotonIDProd_*_*', 'keep *_hfRecoEcalCandidate_*_*', 'keep *_hfEMClusters_*_*', 'keep *_pixelTracks_*_*', 'keep *_pixelVertices_*_*', 'drop CaloTowersSorted_towerMakerPF_*_*', 'keep recoPFRecHits_*_Cleaned_*', 'keep recoPFClusters_*_*_*', 'keep recoPFBlocks_*_*_*', 'keep recoPFCandidates_*_*_*', 'keep recoPFDisplacedVertexs_*_*_*', 'keep *_pfElectronTranslator_*_*', 'keep *_trackerDrivenElectronSeeds_preid_*', 'keep *_offlineBeamSpot_*_*', 'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*', 'keep *_l1GtRecord_*_*', 'keep *_l1GtTriggerMenuLite_*_*', 'keep *_conditionsInEdm_*_*', 'keep *_l1extraParticles_*_*', 'keep L1MuGMTReadoutCollection_gtDigis_*_*', 'keep L1GctEmCand*_gctDigis_*_*', 'keep L1GctJetCand*_gctDigis_*_*', 'keep L1GctEtHad*_gctDigis_*_*', 'keep L1GctEtMiss*_gctDigis_*_*', 'keep L1GctEtTotal*_gctDigis_*_*')+cms.untracked.vstring('keep L1GctHtMiss*_gctDigis_*_*', 'keep L1GctJetCounts*_gctDigis_*_*', 'keep L1GctHFRingEtSums*_gctDigis_*_*', 'keep L1GctHFBitCounts*_gctDigis_*_*', 'keep LumiDetails_lumiProducer_*_*', 'keep LumiSummary_lumiProducer_*_*', 'drop *_hlt*_*_*', 'keep *_hltL1GtObjectMap_*_*', 'keep edmTriggerResults_*_*_*', 'keep triggerTriggerEvent_*_*_*', 'keep *_MEtoEDMConverter_*_*', 'keep L1AcceptBunchCrossings_*_*_*', 'keep L1TriggerScalerss_*_*_*', 'keep Level1TriggerScalerss_*_*_*', 'keep LumiScalerss_*_*_*', 'keep BeamSpotOnlines_*_*_*', 'keep DcsStatuss_*_*_*', 'keep *_logErrorHarvester_*_*', 'drop *_MEtoEDMConverter_*_*', 'drop *_*_*_SKIM')), fileName = cms.untracked.string('LogError.root'), dataset = cms.untracked.PSet( filterName = cms.untracked.string('LogError'), diff --git a/DPGAnalysis/Skims/python/WElectronSkim_cff.py b/DPGAnalysis/Skims/python/WElectronSkim_cff.py index cbfde12f30d0f..c0f258f067390 100644 --- a/DPGAnalysis/Skims/python/WElectronSkim_cff.py +++ b/DPGAnalysis/Skims/python/WElectronSkim_cff.py @@ -14,7 +14,7 @@ ELECTRON_ET_CUT_MIN = 10.0 TAG_ELECTRON_ET_CUT_MIN = 20.0 W_ELECTRON_ET_CUT_MIN = 27.0 -ELECTRON_COLL = "gsfElectrons" +ELECTRON_COLL = "gedGsfElectrons" ELECTRON_CUTS = "(abs(superCluster.eta)<2.5) && (ecalEnergy*sin(superClusterPosition.theta)>" + str(ELECTRON_ET_CUT_MIN) + ")" #met, mt cuts for W selection diff --git a/DPGAnalysis/Skims/python/WZinterestingEventFilter_cfi.py b/DPGAnalysis/Skims/python/WZinterestingEventFilter_cfi.py index 833fbb6a40f5d..3a6d1d3af3507 100644 --- a/DPGAnalysis/Skims/python/WZinterestingEventFilter_cfi.py +++ b/DPGAnalysis/Skims/python/WZinterestingEventFilter_cfi.py @@ -2,7 +2,7 @@ WZInterestingEventSelector = cms.EDFilter( "WZInterestingEventSelector", - electronCollection = cms.untracked.InputTag('gsfElectrons'), + electronCollection = cms.untracked.InputTag('gedGsfElectrons'), pfMetCollection = cms.untracked.InputTag('pfMet'), offlineBSCollection = cms.untracked.InputTag('offlineBeamSpot'), ptCut = cms.double(20.), diff --git a/DPGAnalysis/Skims/python/commonCuts_cff.py b/DPGAnalysis/Skims/python/commonCuts_cff.py index 4b9dea9abfe37..5589cd865bf1c 100644 --- a/DPGAnalysis/Skims/python/commonCuts_cff.py +++ b/DPGAnalysis/Skims/python/commonCuts_cff.py @@ -13,7 +13,7 @@ muonLabel = cms.InputTag("muons"), photonLabel = cms.InputTag("photons"), jetLabel = cms.InputTag("iterativeCone5CaloJets"), - electronLabel = cms.InputTag("gsfElectrons"), + electronLabel = cms.InputTag("gedGsfElectrons"), triggerResults_ = cms.InputTag("TriggerResults","","HLT"), ObjectMap = cms.InputTag("hltL1GtObjectMap"), GtDigis = cms.InputTag("gtDigis") diff --git a/DPGAnalysis/Skims/python/electronTagProbeFilters_cff.py b/DPGAnalysis/Skims/python/electronTagProbeFilters_cff.py index a262c579ad82b..f20b95b208613 100644 --- a/DPGAnalysis/Skims/python/electronTagProbeFilters_cff.py +++ b/DPGAnalysis/Skims/python/electronTagProbeFilters_cff.py @@ -28,7 +28,7 @@ # Make the input candidate collections electronTagCands = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 1.0 && abs(eta) < 2.1'), filter = cms.bool(True) ) diff --git a/DPGAnalysis/Skims/python/singleElectronSkim_cff.py b/DPGAnalysis/Skims/python/singleElectronSkim_cff.py index df3be16f98cd2..e1a1e6296c4d5 100644 --- a/DPGAnalysis/Skims/python/singleElectronSkim_cff.py +++ b/DPGAnalysis/Skims/python/singleElectronSkim_cff.py @@ -18,35 +18,35 @@ #Define the Reco quality cut singleRecoElectronPt20Filter = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 20.0 && abs(eta) < 2.5 ' ), filter = cms.bool(True), minN = cms.int32(1) ) singleRecoElectronPt15Filter = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 15.0 && abs(eta) < 2.5 ' ), filter = cms.bool(True), minN = cms.int32(1) ) singleRecoElectronPt10Filter = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 10.0 && abs(eta) < 2.5 ' ), filter = cms.bool(True), minN = cms.int32(1) ) singleRecoElectronPt5Filter = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 5.0 && abs(eta) < 2.5 ' ), filter = cms.bool(True), minN = cms.int32(1) ) singleRecoElectronPt1Filter = cms.EDFilter("GsfElectronRefSelector", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), cut = cms.string('pt > 1.0 && abs(eta) < 2.5 ' ), filter = cms.bool(True), minN = cms.int32(1) @@ -73,7 +73,7 @@ # ) #electronCounter = cms.EDFilter("CandViewCountFilter", -# src = cms.InputTag("gsfElectrons"), +# src = cms.InputTag("gedGsfElectrons"), # minNumber = cms.uint32(1) # ) @@ -91,8 +91,8 @@ #ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi1Low = cms.double(0.3) #ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi1High = cms.double(0.3) #ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi2 = cms.double(0.3) -#gsfElectrons.applyPreselection = cms.bool(False) -#gsfElectrons.applyAmbResolution = cms.bool(True) +#gedGsfElectrons.applyPreselection = cms.bool(False) +#gedGsfElectrons.applyAmbResolution = cms.bool(True) #Define group sequence, using HLT/Reco quality cut. #singleMuHLTQualitySeq = cms.Sequence() diff --git a/DQM/Physics/python/ExoticaDQM_cfi.py b/DQM/Physics/python/ExoticaDQM_cfi.py index da265cea8d94a..5101661e31f84 100644 --- 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 index 95595bee62775..306f8e4695ce1 100644 --- 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 index 394e60db89c4e..ba62d81234d87 100644 --- 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 index ba7e5dfa33ac5..6c2ad1a7c8f5b 100644 --- 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 index 3107be284c705..333cb80a58bf7 100644 --- 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 index ecae1d3080551..4566f4d6d798e 100644 --- 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 index 7f7977a55ecbf..2e2f16e9e158f 100644 --- 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 index 94e729ec038c4..6ca508e55ffcb 100644 --- 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 index 2e1ff9b47dfe5..839844f97175a 100644 --- 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 index 0e92c8350db10..4377f5fdb6b2f 100644 --- 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 index 13537da4bed5b..683174caa75a2 100644 --- 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 index 4cb6bc630475a..b25126704388b 100644 --- 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 index eafeb0bfa862c..25dab648f17f8 100644 --- 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/electronAnalyzer_cfi.py b/DQMOffline/EGamma/python/electronAnalyzer_cfi.py index b9878bf5bfbf3..d70a3af4e8785 100644 --- 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 index 24163b51ef234..0c36c5a551d06 100644 --- 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 index 256229e7a6519..7629ad157a1d5 100644 --- 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/DQMOffline/EGamma/python/zmumugammaAnalyzer_cfi.py b/DQMOffline/EGamma/python/zmumugammaAnalyzer_cfi.py index f24124c3e43ac..393002b350547 100644 --- 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 index a0859dbbf8663..f27a5e93d756f 100644 --- 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 index 943bd5c392730..2be3821489115 100644 --- 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/DQMOffline/Trigger/python/EgHLTOffTrigSelection_cfi.py b/DQMOffline/Trigger/python/EgHLTOffTrigSelection_cfi.py index 6da04166e4a4e..8ac1f896077f1 100644 --- a/DQMOffline/Trigger/python/EgHLTOffTrigSelection_cfi.py +++ b/DQMOffline/Trigger/python/EgHLTOffTrigSelection_cfi.py @@ -118,7 +118,7 @@ egHLTOffDoubleEleEt10SWCuts.endcap.minEt = 10. egHLTOffDoubleEleEt10SWCuts.endcap.cuts = "et" -#photons +#gedPhotons egHLTOffPhoEt10Cuts = cms.PSet(egHLTOffBasePhoTrigCuts) egHLTOffPhoEt10Cuts.trigName = "hltL1NonIsoHLTNonIsoSinglePhotonEt10HcalIsolFilter" egHLTOffPhoEt10Cuts.barrel.minEt = 10. diff --git a/DQMOffline/Trigger/python/EgHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/EgHLTOfflineSource_cfi.py index 25ddd76ecff5a..64e143ee9a4a6 100644 --- a/DQMOffline/Trigger/python/EgHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/EgHLTOfflineSource_cfi.py @@ -18,8 +18,8 @@ filterInactiveTriggers = cms.bool(True), EndcapRecHitCollection = cms.InputTag("reducedEcalRecHitsEE"), BarrelRecHitCollection = cms.InputTag("reducedEcalRecHitsEB"), - ElectronCollection = cms.InputTag("gsfElectrons"), - PhotonCollection = cms.InputTag("photons"), + ElectronCollection = cms.InputTag("gedGsfElectrons"), + PhotonCollection = cms.InputTag("gedPhotons"), VertexCollection = cms.InputTag("offlinePrimaryVertices"), #CaloJetCollection = cms.InputTag("sisCone5CaloJets"), #--------Morse diff --git a/DQMOffline/Trigger/python/HLTTauDQMOffline_cfi.py b/DQMOffline/Trigger/python/HLTTauDQMOffline_cfi.py index 5c20b529d0661..a9036b46e508e 100644 --- a/DQMOffline/Trigger/python/HLTTauDQMOffline_cfi.py +++ b/DQMOffline/Trigger/python/HLTTauDQMOffline_cfi.py @@ -15,7 +15,7 @@ PFTauProducer = cms.untracked.InputTag("hpsPFTauProducer") ), Electrons = cms.untracked.PSet( - ElectronCollection = cms.untracked.InputTag("gsfElectrons"), + ElectronCollection = cms.untracked.InputTag("gedGsfElectrons"), doID = cms.untracked.bool(False), InnerConeDR = cms.untracked.double(0.02), MaxIsoVar = cms.untracked.double(0.02), @@ -48,7 +48,7 @@ Photons = cms.untracked.PSet( doPhotons = cms.untracked.bool(True), - PhotonCollection = cms.untracked.InputTag("photons"), + PhotonCollection = cms.untracked.InputTag("gedPhotons"), etMin = cms.untracked.double(10.0), ECALIso = cms.untracked.double(3.0) ), diff --git a/DQMOffline/Trigger/python/TopElectronHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/TopElectronHLTOfflineSource_cfi.py index c6f6820fa64bb..d0954a54bd87e 100644 --- a/DQMOffline/Trigger/python/TopElectronHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/TopElectronHLTOfflineSource_cfi.py @@ -8,7 +8,7 @@ electronTriggerNames = cms.vstring(["HLT_EgammaSuperClusterOnly_L1R","HLT_Ele10_LW_L1R"]), triggerResultsLabel = cms.InputTag("TriggerResults","","HLT"), triggerSummaryLabel = cms.InputTag("hltTriggerSummaryAOD","","HLT"), - electronCollection = cms.InputTag("gsfElectrons"), + electronCollection = cms.InputTag("gedGsfElectrons"), primaryVertexCollection = cms.InputTag("offlinePrimaryVertices"), triggerJetFilterLabel = cms.InputTag("hltL1sQuadJet15U","","HLT"), triggerElectronFilterLabel = cms.InputTag("hltL1sL1SingleEG1", "", "HLT"), diff --git a/FastSimulation/Configuration/python/FamosSequences_cff.py b/FastSimulation/Configuration/python/FamosSequences_cff.py index 228182c20b31a..063a441818e6c 100644 --- a/FastSimulation/Configuration/python/FamosSequences_cff.py +++ b/FastSimulation/Configuration/python/FamosSequences_cff.py @@ -663,8 +663,8 @@ famosGsfTrackSequence+ famosParticleFlowSequence+ famosElectronSequence+ - interestingEleIsoDetIdEB+ - interestingEleIsoDetIdEE+ + interestingGedEleIsoDetIdEB+ + interestingGedEleIsoDetIdEE+ egammaIsolationSequence ) @@ -674,6 +674,8 @@ caloRecHits+ ecalClustersNoPFBox+ famosPhotonSequence+ + interestingGedGamIsoDetIdEB+ + interestingGedGamIsoDetIdEE+ interestingGamIsoDetIdEB+ interestingGamIsoDetIdEE ) diff --git a/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py b/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py index 8c1d91a716072..b419daa66910f 100644 --- a/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py +++ b/FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py @@ -14,6 +14,7 @@ from FastSimulation.ParticleFlow.FSparticleFlow_cfi import * # The following is replaced by the MVA-based #from RecoParticleFlow.PFProducer.pfGsfElectronCiCSelector_cff import * +from RecoEgamma.EgammaIsolationAlgos.particleBasedIsoProducer_cff import * from RecoParticleFlow.PFProducer.pfGsfElectronMVASelector_cff import * from RecoParticleFlow.PFProducer.pfLinker_cff import * from RecoParticleFlow.PFProducer.particleFlowEGamma_cff import * @@ -56,12 +57,10 @@ particleFlowTmp+ particleFlowTmpPtrs+ particleFlowEGammaFinal+ - FSparticleFlow+ - pfElectronTranslatorSequence+ - pfPhotonTranslatorSequence + FSparticleFlow ) -particleFlowLinks = cms.Sequence(particleFlow+particleFlowPtrs) +particleFlowLinks = cms.Sequence(particleFlow+particleFlowPtrs + particleBasedIsolationSequence) # PF Reco Jets and MET diff --git a/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py b/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py index b4cf4545defa6..2847f0cc6cd43 100644 --- a/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py +++ b/FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py @@ -56,12 +56,10 @@ particleFlowTmp+ particleFlowTmpPtrs+ particleFlowEGammaFinal+ - FSparticleFlow+ - pfElectronTranslatorSequence+ - pfPhotonTranslatorSequence + FSparticleFlow ) -particleFlowLinks = cms.Sequence(particleFlow*particleFlowPtrs) +particleFlowLinks = cms.Sequence(particleFlow*particleFlowPtrs+particleBasedIsolationSequence) # PF Reco Jets and MET from RecoJets.Configuration.RecoPFJets_cff import * diff --git a/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py b/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py index e7a1912aa6eed..853064be4dfbf 100644 --- 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 index d613b0c3810c0..b1a53604770f7 100644 --- 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 index 66d93d94442f1..5b288fa55db2a 100644 --- 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 index 2696986bb3721..474ffbc0713ea 100644 --- 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 index 9ede5373a9229..49b0aeb46320d 100644 --- 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 index 30447787df4ac..9d46ce90e9497 100644 --- 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 index 22e604e1ec7d3..a3870fe5c1ad8 100644 --- 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/InterestingDetIdFromSuperClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h new file mode 100644 index 0000000000000..03d618cb9562d --- /dev/null +++ b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h @@ -0,0 +1,71 @@ +#ifndef _INTERESTINGDETIDFROMSUPERCLUSTERPRODUCER_H +#define _INTERESTINGDETIDFROMSUPERCLUSTERPRODUCER_H + +// -*- C++ -*- +// +// Package: InterestingDetIdFromSuperClusterProducer +// Class: InterestingDetIdFromSuperClusterProducer +// +/**\class InterestingDetIdFromSuperClusterProducer +Adapted from InterestingDetIdCollectionProducer by J.Bendavid + +Make a collection of detids to be kept tipically in a AOD rechit collection + +The following classes of "interesting id" are considered + + 1.All rechits included in all subclusters, plus in a region around the seed of each subcluster + The size of the region is specified by + minimalEtaSize_, minimalPhiSize_ + + 2. if the severity of the hit is >= severityLevel_ + If severityLevel=0 this class is ignored + + 3. Channels next to dead ones, keepNextToDead_ is true + 4. Channels next to the EB/EE transition if keepNextToBoundary_ is true +*/ + + + +// system include files +#include + +// user include files +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/EDProducer.h" + +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" +#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" + +class CaloTopology; +class EcalSeverityLevelAlgo; + +class InterestingDetIdFromSuperClusterProducer : public edm::EDProducer { + public: + //! ctor + explicit InterestingDetIdFromSuperClusterProducer(const edm::ParameterSet&); + virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; + //! producer + virtual void produce(edm::Event &, const edm::EventSetup&); + + private: + // ----------member data --------------------------- + edm::EDGetTokenT recHitsToken_; + edm::EDGetTokenT superClustersToken_; + std::string interestingDetIdCollection_; + int minimalEtaSize_; + int minimalPhiSize_; + const CaloTopology* caloTopology_; + + int severityLevel_; + const EcalSeverityLevelAlgo * severity_; + bool keepNextToDead_; + bool keepNextToBoundary_; + +}; + +#endif diff --git a/RecoEcal/EgammaClusterProducers/python/interestingDetIdFromSuperClusterProducer_cfi.py b/RecoEcal/EgammaClusterProducers/python/interestingDetIdFromSuperClusterProducer_cfi.py new file mode 100644 index 0000000000000..271ee719760f0 --- /dev/null +++ b/RecoEcal/EgammaClusterProducers/python/interestingDetIdFromSuperClusterProducer_cfi.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +interestingDetIdFromSuperClusterProducer = cms.EDProducer("InterestingDetIdFromSuperClusterProducer", + superClustersLabel = cms.InputTag(''), + recHitsLabel = cms.InputTag('ecalRecHit','EcalRecHitsEB'), + etaSize = cms.int32(5), + phiSize = cms.int32(5), + # keep hits with severity >= severityLevel + # set to negative to skip + severityLevel = cms.int32(1), + interestingDetIdCollection = cms.string(''), + keepNextToDead = cms.bool(True), + keepNextToBoundary = cms.bool(True) + ) diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py index dcdf2d73453c1..bce4dc69368da 100644 --- a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py @@ -1,33 +1,6 @@ import FWCore.ParameterSet.Config as cms -from CondCore.DBCommon.CondDBCommon_cfi import CondDBCommon import os -pfSCecalGBRESSource = cms.ESSource( - "PoolDBESSource", - CondDBCommon, - DumpStat=cms.untracked.bool(False), - toGet = cms.VPSet( - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('pfscecal_EBCorrection_offline'), - label = cms.untracked.string('pfscecal_EBCorrection_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('pfscecal_EECorrection_offline'), - label = cms.untracked.string('pfscecal_EECorrection_offline') - ), - ) -) -pfSCecalGBRESSource.connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000') - -pfSCecalPrefer = cms.ESPrefer( - 'PoolDBESSource', - 'pfSCecalGBRESSource', - GBRWrapperRcd = cms.vstring('GBRForest/pfscecal_EBCorrection_offline', - 'GBRForest/pfscecal_EECorrection_offline') -) - particleFlowSuperClusterECALBox = cms.EDProducer( "PFECALSuperClusterProducer", # verbosity diff --git a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py index 689736b9d7dff..3e44170fa7ec1 100644 --- a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py +++ b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py @@ -17,6 +17,29 @@ recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE") ) +#SuperClusters for GED reco +import RecoEcal.EgammaClusterProducers.interestingDetIdFromSuperClusterProducer_cfi + +interestingEcalDetIdPFEB = RecoEcal.EgammaClusterProducers.interestingDetIdFromSuperClusterProducer_cfi.interestingDetIdFromSuperClusterProducer.clone( + superClustersLabel = cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"), + recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB") + ) + +interestingEcalDetIdPFEE = RecoEcal.EgammaClusterProducers.interestingDetIdFromSuperClusterProducer_cfi.interestingDetIdFromSuperClusterProducer.clone( + superClustersLabel = cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALEndcapWithPreshower"), + recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE") + ) + +interestingEcalDetIdRefinedEB = RecoEcal.EgammaClusterProducers.interestingDetIdFromSuperClusterProducer_cfi.interestingDetIdFromSuperClusterProducer.clone( + superClustersLabel = cms.InputTag("particleFlowEGamma",""), + recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB") + ) + +interestingEcalDetIdRefinedEE = RecoEcal.EgammaClusterProducers.interestingDetIdFromSuperClusterProducer_cfi.interestingDetIdFromSuperClusterProducer.clone( + superClustersLabel = cms.InputTag("particleFlowEGamma",""), + recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE") + ) + # rechits associated to high pt tracks for HSCP from TrackingTools.TrackAssociator.default_cfi import TrackAssociatorParameterBlock @@ -27,22 +50,21 @@ MinTrackPt = cms.double(50.0) ) - - reducedEcalRecHitsEB = cms.EDProducer("ReducedRecHitCollectionProducer", recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"), interestingDetIdCollections = cms.VInputTag( # ecal cms.InputTag("interestingEcalDetIdEB"), cms.InputTag("interestingEcalDetIdEBU"), + #ged + cms.InputTag("interestingEcalDetIdPFEB"), + cms.InputTag("interestingEcalDetIdRefinedEB"), # egamma - cms.InputTag("interestingEleIsoDetIdEB"), + cms.InputTag("interestingGedEleIsoDetIdEB"), + cms.InputTag("interestingGedGamIsoDetIdEB"), cms.InputTag("interestingGamIsoDetIdEB"), # tau #cms.InputTag("caloRecoTauProducer"), - #pf - cms.InputTag("pfElectronInterestingEcalDetIdEB"), - cms.InputTag("pfPhotonInterestingEcalDetIdEB"), # muons cms.InputTag("muonEcalDetIds"), # high pt tracks @@ -56,14 +78,15 @@ interestingDetIdCollections = cms.VInputTag( # ecal cms.InputTag("interestingEcalDetIdEE"), + #ged + cms.InputTag("interestingEcalDetIdPFEE"), + cms.InputTag("interestingEcalDetIdRefinedEE"), # egamma - cms.InputTag("interestingEleIsoDetIdEE"), + cms.InputTag("interestingGedEleIsoDetIdEE"), + cms.InputTag("interestingGedGamIsoDetIdEE"), cms.InputTag("interestingGamIsoDetIdEE"), # tau #cms.InputTag("caloRecoTauProducer"), - #pf - cms.InputTag("pfElectronInterestingEcalDetIdEE"), - cms.InputTag("pfPhotonInterestingEcalDetIdEE"), # muons cms.InputTag("muonEcalDetIds"), # high pt tracks @@ -75,7 +98,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() ) @@ -85,8 +109,16 @@ reducedEcalRecHitsSequence = cms.Sequence(interestingEcalDetIdEB*interestingEcalDetIdEBU* interestingEcalDetIdEE* + interestingEcalDetIdPFEB*interestingEcalDetIdPFEE* + interestingEcalDetIdRefinedEB*interestingEcalDetIdRefinedEE* interestingTrackEcalDetIds* reducedEcalRecHitsEB* reducedEcalRecHitsEE* seldigis* reducedEcalRecHitsES) + +reducedEcalRecHitsSequenceEcalOnly = cms.Sequence(interestingEcalDetIdEB*interestingEcalDetIdEBU* + interestingEcalDetIdEE* + reducedEcalRecHitsEB* + reducedEcalRecHitsEE* + seldigis) diff --git a/RecoEcal/EgammaClusterProducers/src/InterestingDetIdFromSuperClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/InterestingDetIdFromSuperClusterProducer.cc new file mode 100644 index 0000000000000..62c2d992f7fc6 --- /dev/null +++ b/RecoEcal/EgammaClusterProducers/src/InterestingDetIdFromSuperClusterProducer.cc @@ -0,0 +1,169 @@ +#include "RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h" + +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/ESHandle.h" + + +#include "DataFormats/EcalDetId/interface/EBDetId.h" +#include "DataFormats/EcalDetId/interface/EEDetId.h" + +#include "DataFormats/DetId/interface/DetIdCollection.h" +#include "DataFormats/EgammaReco/interface/SuperCluster.h" + +#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/CaloTopology/interface/CaloTopology.h" +#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" + +#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h" +#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h" +#include "RecoEcal/EgammaCoreTools/interface/EcalTools.h" + + +InterestingDetIdFromSuperClusterProducer::InterestingDetIdFromSuperClusterProducer(const edm::ParameterSet& iConfig) +{ + + recHitsToken_ = + consumes(iConfig.getParameter< edm::InputTag > ("recHitsLabel")); + superClustersToken_ = + consumes(iConfig.getParameter< edm::InputTag >("superClustersLabel")); + + interestingDetIdCollection_ = iConfig.getParameter("interestingDetIdCollection"); + + minimalEtaSize_ = iConfig.getParameter ("etaSize"); + minimalPhiSize_ = iConfig.getParameter ("phiSize"); + if ( minimalPhiSize_ % 2 == 0 || minimalEtaSize_ % 2 == 0) + edm::LogError("InterestingDetIdFromSuperClusterProducerError") << "Size of eta/phi should be odd numbers"; + + //register your products + produces< DetIdCollection > (interestingDetIdCollection_) ; + + severityLevel_ = iConfig.getParameter("severityLevel"); + keepNextToDead_ = iConfig.getParameter("keepNextToDead"); + keepNextToBoundary_ = iConfig.getParameter("keepNextToBoundary"); +} + + +void InterestingDetIdFromSuperClusterProducer::beginRun (edm::Run const& run, const edm::EventSetup & iSetup) +{ + edm::ESHandle theCaloTopology; + iSetup.get().get(theCaloTopology); + caloTopology_ = &(*theCaloTopology); + + edm::ESHandle sevLv; + iSetup.get().get(sevLv); + severity_ = sevLv.product(); +} + +// ------------ method called to produce the data ------------ +void +InterestingDetIdFromSuperClusterProducer::produce (edm::Event& iEvent, + const edm::EventSetup& iSetup) +{ + using namespace edm; + using namespace std; + + // take BasicClusters + Handle pClusters; + iEvent.getByToken(superClustersToken_, pClusters); + + // take EcalRecHits + Handle recHitsHandle; + iEvent.getByToken(recHitsToken_,recHitsHandle); + + //Create empty output collections + std::vector indexToStore; + indexToStore.reserve(1000); + + reco::SuperClusterCollection::const_iterator sclusIt; + + std::vector xtalsToStore; + xtalsToStore.reserve(50); + + //loop over superclusters + for (sclusIt=pClusters->begin(); sclusIt!=pClusters->end(); sclusIt++) { + //loop over subclusters + for (reco::CaloCluster_iterator clusIt = sclusIt->clustersBegin(); clusIt!=sclusIt->clustersEnd(); ++clusIt) { + //PG barrel + + float eMax=0.; + DetId eMaxId(0); + + std::vector > clusterDetIds = (*clusIt)->hitsAndFractions(); + std::vector >::iterator posCurrent; + + EcalRecHit testEcalRecHit; + + for(posCurrent = clusterDetIds.begin(); posCurrent != clusterDetIds.end(); posCurrent++) + { + EcalRecHitCollection::const_iterator itt = recHitsHandle->find((*posCurrent).first); + if ((!((*posCurrent).first.null())) && (itt != recHitsHandle->end()) && ((*itt).energy() > eMax) ) + { + eMax = (*itt).energy(); + eMaxId = (*itt).id(); + } + } + + if (eMaxId.null()) + continue; + + const CaloSubdetectorTopology* topology = caloTopology_->getSubdetectorTopology(eMaxId.det(),eMaxId.subdetId()); + + xtalsToStore=topology->getWindow(eMaxId,minimalEtaSize_,minimalPhiSize_); + std::vector > xtalsInClus=(*clusIt)->hitsAndFractions(); + + for (unsigned int ii=0;iibegin(); it != recHitsHandle->end(); ++it) { + // also add recHits of dead TT if the corresponding TP is saturated + if ( it->checkFlag(EcalRecHit::kTPSaturated) ) { + indexToStore.push_back(it->id()); + } + // add hits for severities above a threshold + if ( severityLevel_>=0 && + severity_->severityLevel(*it) >=severityLevel_){ + + indexToStore.push_back(it->id()); + } + if (keepNextToDead_) { + // also keep channels next to dead ones + if (EcalTools::isNextToDead(it->id(), iSetup)) { + indexToStore.push_back(it->id()); + } + } + + if (keepNextToBoundary_){ + // keep channels around EB/EE boundary + if (it->id().subdetId() == EcalBarrel){ + EBDetId ebid(it->id()); + if (abs(ebid.ieta())== 85) + indexToStore.push_back(it->id()); + } else { + + if (EEDetId::isNextToRingBoundary(it->id())) + indexToStore.push_back(it->id()); + } + + } + + } + + //unify the vector + std::sort(indexToStore.begin(),indexToStore.end()); + std::unique(indexToStore.begin(),indexToStore.end()); + + std::auto_ptr< DetIdCollection > detIdCollection (new DetIdCollection(indexToStore) ) ; + + + iEvent.put( detIdCollection, interestingDetIdCollection_ ); + +} diff --git a/RecoEcal/EgammaClusterProducers/src/SealModule.cc b/RecoEcal/EgammaClusterProducers/src/SealModule.cc index f8b57945551c3..529b2d8b060f9 100644 --- a/RecoEcal/EgammaClusterProducers/src/SealModule.cc +++ b/RecoEcal/EgammaClusterProducers/src/SealModule.cc @@ -9,6 +9,7 @@ #include "RecoEcal/EgammaClusterProducers/interface/ReducedRecHitCollectionProducer.h" #include "RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h" #include "RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h" +#include "RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h" #include "RecoEcal/EgammaClusterProducers/interface/Multi5x5ClusterProducer.h" #include "RecoEcal/EgammaClusterProducers/interface/Multi5x5SuperClusterProducer.h" #include "RecoEcal/EgammaClusterProducers/interface/CosmicClusterProducer.h" @@ -31,6 +32,7 @@ DEFINE_FWK_MODULE(Multi5x5SuperClusterProducer); DEFINE_FWK_MODULE(ReducedRecHitCollectionProducer); DEFINE_FWK_MODULE(ReducedESRecHitCollectionProducer); DEFINE_FWK_MODULE(InterestingDetIdCollectionProducer); +DEFINE_FWK_MODULE(InterestingDetIdFromSuperClusterProducer); DEFINE_FWK_MODULE(CosmicClusterProducer); DEFINE_FWK_MODULE(EcalDigiSelector); DEFINE_FWK_MODULE(UncleanSCRecoveryProducer); diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py index 856b8337573b0..ff4ec2c76cd50 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py @@ -24,13 +24,14 @@ 'keep *_mustachePhotonCore_*_*', 'keep *_mustachePhotons_*_*', 'keep *_allConversions_*_*', - 'keep *_allConversionsMustache_*_*', + 'keep *_allConversionsOldEG_*_*', 'keep *_ckfOutInTracksFrom*Conversions_*_*', 'keep *_ckfInOutTracksFrom*Conversions_*_*', 'keep *_uncleanedOnlyAllConversions_*_*', 'keep *_uncleanedOnlyCkfOutInTracksFromConversions_*_*', 'keep *_uncleanedOnlyCkfInOutTracksFromConversions_*_*', 'keep *_PhotonIDProd_*_*', + 'keep *_PhotonIDProdGED_*_*', 'keep *_hfRecoEcalCandidate_*_*', 'keep *_hfEMClusters_*_*', 'keep *_gedGsfElectronCores_*_*', @@ -63,7 +64,7 @@ 'drop *_conversions_uncleanedConversions_*', 'drop *_gedPhotonsTmp_valMapPFEgammaCandToPhoton_*', 'keep recoConversions_allConversions_*_*', - 'keep recoConversions_allConversionsMustache_*_*', + 'keep recoConversions_allConversionsOldEG_*_*', 'keep recoTracks_ckfOutInTracksFrom*Conversions_*_*', 'keep recoTracks_ckfInOutTracksFrom*Conversions_*_*', 'keep recoTrackExtras_ckfOutInTracksFrom*Conversions_*_*', @@ -78,6 +79,7 @@ 'keep TrackingRecHitsOwned_uncleanedOnlyCkfOutInTracksFromConversions_*_*', 'keep TrackingRecHitsOwned_uncleanedOnlyCkfInOutTracksFromConversions_*_*', 'keep *_PhotonIDProd_*_*', + 'keep *_PhotonIDProdGED_*_*', 'keep *_hfRecoEcalCandidate_*_*', 'keep *_hfEMClusters_*_*', 'keep *_gedGsfElectronCores_*_*', @@ -110,13 +112,14 @@ 'keep recoConversions_mustacheConversions_*_*', 'drop *_conversions_uncleanedConversions_*', 'keep recoConversions_allConversions_*_*', - 'keep recoConversions_allConversionsMustache_*_*', + 'keep recoConversions_allConversionsOldEG_*_*', 'keep recoTracks_ckfOutInTracksFrom*Conversions_*_*', 'keep recoTracks_ckfInOutTracksFrom*Conversions_*_*', 'keep recoConversions_uncleanedOnlyAllConversions_*_*', 'keep recoTracks_uncleanedOnlyCkfOutInTracksFromConversions_*_*', 'keep recoTracks_uncleanedOnlyCkfInOutTracksFromConversions_*_*', 'keep *_PhotonIDProd_*_*', + 'keep *_PhotonIDProdGED_*_*', 'keep *_hfRecoEcalCandidate_*_*', 'keep *_hfEMClusters_*_*', 'keep *_gedGsfElectronCores_*_*', diff --git a/RecoEgamma/Configuration/python/RecoEgamma_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_cff.py index 8fc7021ffc146..ec298bd00e74f 100644 --- 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*photonIDSequenceGED*eIdSequence*hfEMClusteringSequence) egammarecoFull = cms.Sequence(egammareco*interestingEgammaIsoDetIds*photonIDSequence*eIdSequence*hfEMClusteringSequence) diff --git a/RecoEgamma/Configuration/python/customizeOldEGReco.py b/RecoEgamma/Configuration/python/customizeOldEGReco.py new file mode 100644 index 0000000000000..4a5f5ea8d4903 --- /dev/null +++ b/RecoEgamma/Configuration/python/customizeOldEGReco.py @@ -0,0 +1,296 @@ +import FWCore.ParameterSet.Config as cms +import FWCore.ParameterSet.Utilities as psu +from PhysicsTools.PatAlgos.tools.helpers import massSearchReplaceAnyInputTag as _replaceTags + +def customizeOldEGReco(process): + for path in process.paths: + sequences = getattr(process,path) + #for seq in path: + _replaceTags(sequences, + cms.InputTag('gedGsfElectrons'), + cms.InputTag('gsfElectrons'), + skipLabelTest=True) + _replaceTags(sequences, + cms.InputTag('gedGsfElectronCores'), + cms.InputTag('gsfElectronCores'), + skipLabelTest=True) + #for seq in path: + _replaceTags(sequences, + cms.InputTag('gedPhotons'), + cms.InputTag('photons'), + skipLabelTest=True) + _replaceTags(sequences, + cms.InputTag('gedPhotonCore'), + cms.InputTag('photonCore'), + skipLabelTest=True) + + # all the rest: + if hasattr(process,'DigiToRaw'): + process=_customize_DigiToRaw(process) + if hasattr(process,'RawToDigi'): + process=_customize_RawToDigi(process) + if hasattr(process,'reconstruction'): + process=_customize_Reco(process) + if hasattr(process,'reconstructionWithFamos'): + process=_customize_FastSim(process) + if hasattr(process,'digitisation_step'): + process=_customize_Digi(process) + if hasattr(process,'HLTSchedule'): + process=_customize_HLT(process) + if hasattr(process,'L1simulation_step'): + process=_customize_L1Emulator(process) + if hasattr(process,'dqmoffline_step'): + process=_customize_DQM(process) + if hasattr(process,'dqmHarvesting'): + process=_customize_harvesting(process) + if hasattr(process,'validation_step'): + process=_customize_Validation(process) + + + return process + +def _configurePFForGEDEGamma(process): + #fix a few things in the GED from the mass-replace + process.gedGsfElectronsTmp.gsfElectronCoresTag = cms.InputTag('gedGsfElectronCores') + process.particleBasedIsolation.electronProducer = cms.InputTag("gedGsfElectrons") + process.gedPhotonsTmp.photonProducer = cms.InputTag('gedPhotonCore') + process.particleBasedIsolation.photonProducer = cms.InputTag("gedPhotons") + + process.gedPhotonsTmp.candidateP4type = cms.string('fromEcalEnergy') + process.gedPhotons.candidateP4type = cms.string('fromEcalEnergy') + + process.gedGsfElectronsTmp.useEcalRegression = cms.bool(False) + process.gedGsfElectronsTmp.useCombinationRegression = cms.bool(False) + + #for later + process.particleFlowBlock.SCBarrel = cms.InputTag('correctedHybridSuperClusters') + process.particleFlowBlock.SCEndcap = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower') + #add in conversions + ## for PF + + process.allConversionSequence += process.allConversionOldEGSequence + process.pfConversions.conversionCollection = cms.InputTag('allConversionsOldEG') + process.photons.conversionProducer = cms.InputTag('oldegConversions') + #return to old EG-based conversions based reco::Photon + process.ckfTracksFromConversions += process.ckfTracksFromOldEGConversions + process.conversionTrackProducers += process.oldegConversionTrackProducers + process.conversionTrackMergers += process.oldegConversionTrackMergers + if hasattr(process,'conversionSequence'): + process.conversionSequence += process.oldegConversionSequence + process.photonSequence.remove(process.mustachePhotonSequence) + process.particleFlowBlock.EGPhotons = cms.InputTag('photons') + process.particleFlowBlock.PhotonSelectionCuts = cms.vdouble(1,10,2.0, 0.001, 4.2, 0.003, 2.2, 0.001, 0.05, 10.0, 0.10) + #tell PFProducer to use old PF electron / PF photon code + process.particleFlowTmp.useEGammaFilters = cms.bool(False) + process.particleFlowTmp.usePFPhotons = cms.bool(True) + process.particleFlowTmp.usePFElectrons = cms.bool(True) + process.particleFlowTmp.sumPtTrackIso = cms.double(2.0) + process.particleFlowTmp.photon_HoE = cms.double(0.10) + + #re-route PF linker to use old EG collections + process.particleFlow.GsfElectrons = cms.InputTag('gsfElectrons') + process.particleFlow.Photons = cms.InputTag('pfPhotonTranslator:pfphot') + return process + + + +def _customize_DQM(process): + try: + process.ecalBarrelClusterTask.SuperClusterCollection = cms.InputTag("correctedHybridSuperClusters") + process.ecalBarrelClusterTask.BasicClusterCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters") + process.ecalEndcapClusterTask.SuperClusterCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapSuperClusters") + process.ecalEndcapClusterTask.BasicClusterCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters") + except AttributeError: + pass + try: + process.ecalBarrelClusterTaskExtras.SuperClusterCollection = cms.InputTag("correctedHybridSuperClusters") + process.ecalEndcapClusterTaskExtras.SuperClusterCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapSuperClusters") + except AttributeError: + pass + try: + process.ecalBarrelRecoSummary.superClusterCollection_EB = cms.InputTag("correctedHybridSuperClusters") + process.ecalBarrelRecoSummary.basicClusterCollection_EB = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters") + process.ecalEndcapRecoSummary.superClusterCollection_EE = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower") + process.ecalEndcapRecoSummary.basicClusterCollection_EE = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters") + except AttributeError: + pass + + return process + + +def _customize_Validation(process): + _replaceTags(process.validation_step, + cms.InputTag('gedGsfElectrons'), + cms.InputTag('gsfElectrons'), + skipLabelTest=True) + _replaceTags(process.validation_step, + cms.InputTag('gedGsfElectronCores'), + cms.InputTag('gsfElectronCores'), + skipLabelTest=True) + #don't ask... just don't ask + if hasattr(process,'HLTSusyExoValFastSim'): + process.HLTSusyExoValFastSim.PlotMakerRecoInput.electrons = \ + cms.string('gsfElectrons') + for pset in process.HLTSusyExoValFastSim.reco_parametersets: + pset.electrons = cms.string('gsfElectrons') + if hasattr(process,'HLTSusyExoVal'): + process.HLTSusyExoVal.PlotMakerRecoInput.electrons = \ + cms.string('gsfElectrons') + for pset in process.HLTSusyExoVal.reco_parametersets: + pset.electrons = cms.string('gsfElectrons') + if hasattr(process,'hltHiggsValidator'): + process.hltHiggsValidator.H2tau.recElecLabel = \ + cms.string('gsfElectrons') + process.hltHiggsValidator.HZZ.recElecLabel = \ + cms.string('gsfElectrons') + process.hltHiggsValidator.HWW.recElecLabel = \ + cms.string('gsfElectrons') + if hasattr(process,'oldpfPhotonValidation'): + process.photonValidationSequence += process.oldpfPhotonValidation + process.oldpfPhotonValidation.conversionIOTrackProducer = cms.string('ckfInOutTracksFromOldEGConversions') + process.oldpfPhotonValidation.conversionOITrackProducer = cms.string('ckfOutInTracksFromOldEGConversions') + process.photonValidation.phoProducer = cms.string('photons') + process.photonValidation.conversionIOTrackProducer = cms.string('ckfInOutTracksFromOldEGConversions') + process.photonValidation.conversionOITrackProducer = cms.string('ckfOutInTracksFromOldEGConversions') + process.tkConversionValidation.convProducer = cms.string('allConversionsOldEG') + return process + + +def _customize_Digi(process): + return process + + +def _customize_L1Emulator(process): + return process + + +def _customize_RawToDigi(process): + return process + + +def _customize_DigiToRaw(process): + return process + + +def _customize_HLT(process): + return process + +def _customize_FastSim(process): + process=_configurePFForGEDEGamma(process) + process.egammaHighLevelRecoPostPF.insert(0,process.gsfElectronMergingSequence) + process.famosParticleFlowSequence.insert(8,process.pfPhotonTranslatorSequence) + process.famosParticleFlowSequence.insert(8,process.pfElectronTranslatorSequence) + + process.reducedEcalRecHitsES. EndcapSuperClusterCollection = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower') + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdPFEB) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdPFEE) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdRefinedEB) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdRefinedEE) + + process.interestingGedEleIsoDetIdEB.emObjectLabel = cms.InputTag('gsfElectrons') + process.interestingGedEleIsoDetIdEE.emObjectLabel = cms.InputTag('gsfElectrons') + process.interestingEgammaIsoDetIds.remove(process.interestingGedGamIsoDetIdEB) + process.interestingEgammaIsoDetIds.remove(process.interestingGedGamIsoDetIdEE) + + process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEB"), + cms.InputTag("interestingEcalDetIdEBU"), + # egamma + cms.InputTag("interestingGedEleIsoDetIdEB"), + cms.InputTag("interestingGamIsoDetIdEB"), + # tau + #cms.InputTag("caloRecoTauProducer"), + #pf + cms.InputTag("pfElectronInterestingEcalDetIdEB"), + cms.InputTag("pfPhotonInterestingEcalDetIdEB"), + # muons + cms.InputTag("muonEcalDetIds"), + # high pt tracks + cms.InputTag("interestingTrackEcalDetIds") + ) + process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEE"), + # egamma + cms.InputTag("interestingGedEleIsoDetIdEE"), + cms.InputTag("interestingGamIsoDetIdEE"), + # tau + #cms.InputTag("caloRecoTauProducer"), + #pf + cms.InputTag("pfElectronInterestingEcalDetIdEE"), + cms.InputTag("pfPhotonInterestingEcalDetIdEE"), + # muons + cms.InputTag("muonEcalDetIds"), + # high pt tracks + cms.InputTag("interestingTrackEcalDetIds") + ) + process.allConversionsOldEG.src = cms.InputTag('gsfGeneralConversionTrackMerger') + + if hasattr(process,'ecalDrivenElectronSeeds'): + process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('correctedHybridSuperClusters') + process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower') + return process + + +def _customize_Reco(process): + process=_configurePFForGEDEGamma(process) + process.egammaHighLevelRecoPostPF.insert(0,process.gsfElectronMergingSequence) + process.particleFlowReco.insert(8,process.pfPhotonTranslatorSequence) + process.particleFlowReco.insert(8,process.pfElectronTranslatorSequence) + + process.reducedEcalRecHitsES. EndcapSuperClusterCollection = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower') + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdPFEB) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdPFEE) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdRefinedEB) + process.reducedEcalRecHitsSequence.remove(process.interestingEcalDetIdRefinedEE) + + process.interestingGedEleIsoDetIdEB.emObjectLabel = cms.InputTag('gsfElectrons') + process.interestingGedEleIsoDetIdEE.emObjectLabel = cms.InputTag('gsfElectrons') + process.interestingEgammaIsoDetIds.remove(process.interestingGedGamIsoDetIdEB) + process.interestingEgammaIsoDetIds.remove(process.interestingGedGamIsoDetIdEE) + + process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEB"), + cms.InputTag("interestingEcalDetIdEBU"), + # egamma + cms.InputTag("interestingGedEleIsoDetIdEB"), + cms.InputTag("interestingGamIsoDetIdEB"), + # tau + #cms.InputTag("caloRecoTauProducer"), + #pf + cms.InputTag("pfElectronInterestingEcalDetIdEB"), + cms.InputTag("pfPhotonInterestingEcalDetIdEB"), + # muons + cms.InputTag("muonEcalDetIds"), + # high pt tracks + cms.InputTag("interestingTrackEcalDetIds") + ) + process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEE"), + # egamma + cms.InputTag("interestingGedEleIsoDetIdEE"), + cms.InputTag("interestingGamIsoDetIdEE"), + # tau + #cms.InputTag("caloRecoTauProducer"), + #pf + cms.InputTag("pfElectronInterestingEcalDetIdEE"), + cms.InputTag("pfPhotonInterestingEcalDetIdEE"), + # muons + cms.InputTag("muonEcalDetIds"), + # high pt tracks + cms.InputTag("interestingTrackEcalDetIds") + ) + + if hasattr(process,'ecalDrivenElectronSeeds'): + process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('correctedHybridSuperClusters') + process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower') + return process + + +def _customize_harvesting(process): + if hasattr(process,'oldpfPhotonPostprocessing'): + process.photonPostProcessor += process.oldpfPhotonPostprocessing + return process diff --git a/RecoEgamma/Configuration/python/customizePFforEGammaGED.py b/RecoEgamma/Configuration/python/customizePFforEGammaGED.py deleted file mode 100644 index b94928c150c42..0000000000000 --- a/RecoEgamma/Configuration/python/customizePFforEGammaGED.py +++ /dev/null @@ -1,219 +0,0 @@ -import FWCore.ParameterSet.Config as cms -import FWCore.ParameterSet.Utilities as psu -from PhysicsTools.PatAlgos.tools.helpers import massSearchReplaceAnyInputTag as _replaceTags - -def customizePFforEGammaGED(process): - for path in process.paths: - sequences = getattr(process,path) - #for seq in path: - _replaceTags(sequences, - cms.InputTag('gsfElectrons'), - cms.InputTag('gedGsfElectrons'), - skipLabelTest=True) - _replaceTags(sequences, - cms.InputTag('gsfElectronCores'), - cms.InputTag('gedGsfElectronCores'), - skipLabelTest=True) - - # all the rest: - if hasattr(process,'DigiToRaw'): - process=_customize_DigiToRaw(process) - if hasattr(process,'RawToDigi'): - process=_customize_RawToDigi(process) - if hasattr(process,'reconstruction'): - process=_customize_Reco(process) - if hasattr(process,'reconstructionWithFamos'): - process=_customize_FastSim(process) - if hasattr(process,'digitisation_step'): - process=_customize_Digi(process) - if hasattr(process,'HLTSchedule'): - process=_customize_HLT(process) - if hasattr(process,'L1simulation_step'): - process=_customize_L1Emulator(process) - if hasattr(process,'dqmoffline_step'): - process=_customize_DQM(process) - if hasattr(process,'dqmHarvesting'): - process=_customize_harvesting(process) - if hasattr(process,'validation_step'): - process=_customize_Validation(process) - - - return process - -def _configurePFForGEDEGamma(process): - #for later - process.particleFlowBlock.SCBarrel = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') - process.particleFlowBlock.SCEndcap = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') - #add in conversions - ## for PF - - process.allConversionSequence += process.allConversionMustacheSequence - process.pfConversions.conversionCollection = cms.InputTag('allConversionsMustache') - #setup mustache based reco::Photon - process.ckfTracksFromConversions += process.ckfTracksFromMustacheConversions - process.conversionTrackProducers += process.mustacheConversionTrackProducers - process.conversionTrackMergers += process.mustacheConversionTrackMergers - if hasattr(process,'conversionSequence'): - process.conversionSequence += process.mustacheConversionSequence - process.photonSequence += process.mustachePhotonSequence - process.particleFlowBlock.EGPhotons = cms.InputTag('mustachePhotons') - #tell PFProducer to use PFEG objects / gedTmp - process.particleFlowTmp.useEGammaFilters = cms.bool(True) - process.particleFlowTmp.usePFPhotons = cms.bool(False) - process.particleFlowTmp.usePFElectrons = cms.bool(False) - #re-route PF linker to use ged collections - process.particleFlow.GsfElectrons = cms.InputTag('gedGsfElectrons') - process.particleFlow.Photons = cms.InputTag('gedPhotons') - return process - - - -def _customize_DQM(process): - return process - - -def _customize_Validation(process): - _replaceTags(process.validation_step, - cms.InputTag('gsfElectrons'), - cms.InputTag('gedGsfElectrons'), - skipLabelTest=True) - _replaceTags(process.validation_step, - cms.InputTag('gsfElectronCores'), - cms.InputTag('gedGsfElectronCores'), - skipLabelTest=True) - #don't ask... just don't ask - if hasattr(process,'HLTSusyExoValFastSim'): - process.HLTSusyExoValFastSim.PlotMakerRecoInput.electrons = \ - cms.string('gedGsfElectrons') - for pset in process.HLTSusyExoValFastSim.reco_parametersets: - pset.electrons = cms.string('gedGsfElectrons') - if hasattr(process,'HLTSusyExoVal'): - process.HLTSusyExoVal.PlotMakerRecoInput.electrons = \ - cms.string('gedGsfElectrons') - for pset in process.HLTSusyExoVal.reco_parametersets: - pset.electrons = cms.string('gedGsfElectrons') - if hasattr(process,'hltHiggsValidator'): - process.hltHiggsValidator.H2tau.recElecLabel = \ - cms.string('gedGsfElectrons') - process.hltHiggsValidator.HZZ.recElecLabel = \ - cms.string('gedGsfElectrons') - process.hltHiggsValidator.HWW.recElecLabel = \ - cms.string('gedGsfElectrons') - if hasattr(process,'oldpfPhotonValidation'): - process.photonValidationSequence.remove(process.oldpfPhotonValidation) - return process - - -def _customize_Digi(process): - return process - - -def _customize_L1Emulator(process): - return process - - -def _customize_RawToDigi(process): - return process - - -def _customize_DigiToRaw(process): - return process - - -def _customize_HLT(process): - return process - -def _customize_FastSim(process): - process=_configurePFForGEDEGamma(process) - process.famosParticleFlowSequence.remove(process.pfElectronTranslatorSequence) - process.famosParticleFlowSequence.remove(process.pfPhotonTranslatorSequence) - process.egammaHighLevelRecoPostPF.remove(process.gsfElectronMergingSequence) - process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag( - # ecal - cms.InputTag("interestingEcalDetIdEB"), - cms.InputTag("interestingEcalDetIdEBU"), - # egamma - cms.InputTag("interestingEleIsoDetIdEB"), - cms.InputTag("interestingGamIsoDetIdEB"), - # tau - #cms.InputTag("caloRecoTauProducer"), - #pf - #cms.InputTag("pfElectronInterestingEcalDetIdEB"), - #cms.InputTag("pfPhotonInterestingEcalDetIdEB"), - # muons - cms.InputTag("muonEcalDetIds"), - # high pt tracks - cms.InputTag("interestingTrackEcalDetIds") - ) - process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag( - # ecal - cms.InputTag("interestingEcalDetIdEE"), - # egamma - cms.InputTag("interestingEleIsoDetIdEE"), - cms.InputTag("interestingGamIsoDetIdEE"), - # tau - #cms.InputTag("caloRecoTauProducer"), - #pf - #cms.InputTag("pfElectronInterestingEcalDetIdEE"), - #cms.InputTag("pfPhotonInterestingEcalDetIdEE"), - # muons - cms.InputTag("muonEcalDetIds"), - # high pt tracks - cms.InputTag("interestingTrackEcalDetIds") - ) - process.allConversionsMustache.src = cms.InputTag('gsfGeneralConversionTrackMerger') - if hasattr(process,'ecalDrivenElectronSeeds'): - process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') - process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') - return process - - -def _customize_Reco(process): - process=_configurePFForGEDEGamma(process) - process.particleFlowReco.remove(process.pfElectronTranslatorSequence) - process.particleFlowReco.remove(process.pfPhotonTranslatorSequence) - process.egammaHighLevelRecoPostPF.remove(process.gsfElectronMergingSequence) - process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag( - # ecal - cms.InputTag("interestingEcalDetIdEB"), - cms.InputTag("interestingEcalDetIdEBU"), - # egamma - cms.InputTag("interestingEleIsoDetIdEB"), - cms.InputTag("interestingGamIsoDetIdEB"), - # tau - #cms.InputTag("caloRecoTauProducer"), - #pf - #cms.InputTag("pfElectronInterestingEcalDetIdEB"), - #cms.InputTag("pfPhotonInterestingEcalDetIdEB"), - # muons - cms.InputTag("muonEcalDetIds"), - # high pt tracks - cms.InputTag("interestingTrackEcalDetIds") - ) - process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag( - # ecal - cms.InputTag("interestingEcalDetIdEE"), - # egamma - cms.InputTag("interestingEleIsoDetIdEE"), - cms.InputTag("interestingGamIsoDetIdEE"), - # tau - #cms.InputTag("caloRecoTauProducer"), - #pf - #cms.InputTag("pfElectronInterestingEcalDetIdEE"), - #cms.InputTag("pfPhotonInterestingEcalDetIdEE"), - # muons - cms.InputTag("muonEcalDetIds"), - # high pt tracks - cms.InputTag("interestingTrackEcalDetIds") - ) - - if hasattr(process,'ecalDrivenElectronSeeds'): - process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') - process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') - return process - - -def _customize_harvesting(process): - if hasattr(process,'oldpfPhotonPostprocessing'): - process.photonPostProcessor.remove(process.oldpfPhotonPostprocessing) - return process diff --git a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc index 9dc51b9551aee..6b4d455e6d1ee 100644 --- a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc +++ b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc @@ -1005,12 +1005,17 @@ bool GsfElectronAlgo::isPreselected( GsfElectron * ele ) float mvaValue=generalData_->sElectronMVAEstimator->mva( *(ele),*(eventData_->event)); bool passCutBased=ele->passingCutBasedPreselection(); bool passPF=ele->passingPflowPreselection(); - bool passmva=!(generalData_->strategyCfg.gedElectronMode==true && !ele->ecalDrivenSeed() && mvaValuestrategyCfg.PreSelectMVA); - if(!ele->ecalDrivenSeed()){ - return passmva; - } + if(generalData_->strategyCfg.gedElectronMode==true){ + bool passmva=mvaValue>generalData_->strategyCfg.PreSelectMVA; + if(!ele->ecalDrivenSeed()){ + return passmva; + } + else{ + return passCutBased || passPF || passmva; + } + } else{ - return passCutBased || passPF || passmva; + return passCutBased || passPF; } return true; @@ -1168,10 +1173,16 @@ void GsfElectronAlgo::setMVAOutputs(const std::mapelectrons->end() ; el++ ) { - float mvaValue=generalData_->sElectronMVAEstimator->mva( *(*el),*(eventData_->event)); - GsfElectron::MvaOutput mvaOutput ; - mvaOutput.mva = mvaValue ; - (*el)->setMvaOutput(mvaOutput); + if(generalData_->strategyCfg.gedElectronMode==true){ + float mvaValue=generalData_->sElectronMVAEstimator->mva( *(*el),*(eventData_->event)); + GsfElectron::MvaOutput mvaOutput ; + mvaOutput.mva = mvaValue ; + (*el)->setMvaOutput(mvaOutput); + } + else{ + std::map::const_iterator itcheck=mvaOutputs.find((*el)->gsfTrack()); + (*el)->setMvaOutput(itcheck->second); + } } } diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py index 741201b220858..e9be235d24e49 100644 --- a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py @@ -7,8 +7,8 @@ from RecoEgamma.EgammaElectronProducers.ecalDrivenElectronSeedsParameters_cff import * ecalDrivenElectronSeeds = cms.EDProducer("ElectronSeedProducer", - barrelSuperClusters = cms.InputTag("correctedHybridSuperClusters"), - endcapSuperClusters = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), + barrelSuperClusters = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel"), + endcapSuperClusters = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower"), SeedConfiguration = cms.PSet( ecalDrivenElectronSeedsParameters, # OrderedHitsFactoryPSet = cms.PSet( diff --git a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py index 6f5d8247bce30..18ba599bee25d 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py @@ -3,52 +3,6 @@ from RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi import * from RecoEcal.EgammaClusterProducers.multi5x5BasicClusters_cfi import * -from CondCore.DBCommon.CondDBCommon_cfi import CondDBCommon - -gedelectronGBRESSource = cms.ESSource( - "PoolDBESSource", - CondDBCommon, - DumpStat=cms.untracked.bool(False), - toGet = cms.VPSet( - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedelectron_EBCorrection_offline'), - label = cms.untracked.string('gedelectron_EBCorrection_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedelectron_EECorrection_offline'), - label = cms.untracked.string('gedelectron_EECorrection_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedelectron_EBUncertainty_offline'), - label = cms.untracked.string('gedelectron_EBUncertainty_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedelectron_EEUncertainty_offline'), - label = cms.untracked.string('gedelectron_EEUncertainty_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedelectron_p4combination_offline'), - label = cms.untracked.string('gedelectron_p4combination_offline') - ), - ) -) -gedelectronGBRESSource.connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000') - -gedelectronPrefer = cms.ESPrefer( - 'PoolDBESSource', - 'gedelectronGBRESSource', - GBRWrapperRcd = cms.vstring('GBRForest/gedelectron_EBCorrection_offline', - 'GBRForest/gedelectron_EECorrection_offline', - 'GBRForest/gedelectron_EBUncertainty_offline', - 'GBRForest/gedelectron_EEUncertainty_offline', - 'GBRForest/gedelectron_p4combination_offline') -) - gedGsfElectronsTmp = cms.EDProducer("GEDGsfElectronProducer", # input collections diff --git a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositEcalFromHits_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositEcalFromHits_cff.py index 78b3ce3ec8542..b5505d3e47968 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositEcalFromHits_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositEcalFromHits_cff.py @@ -3,7 +3,7 @@ from RecoEgamma.EgammaIsolationAlgos.eleEcalExtractorBlocks_cff import * eleIsoDepositEcalFromHits = cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), trackType = cms.string('candidate'), MultipleDepositsFlag = cms.bool(False), ExtractorPSet = cms.PSet(EleIsoEcalFromHitsExtractorBlock) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromHits_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromHits_cff.py index d2b70b6bdcb0a..2e7c6926bab05 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromHits_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromHits_cff.py @@ -6,7 +6,7 @@ #isolation with RecHits. #Currently, EGamma POG is recommending HCAL Isolation with Towers eleIsoDepositHcalFromHits = cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), trackType = cms.string('candidate'), MultipleDepositsFlag = cms.bool(False), ExtractorPSet = cms.PSet(EleIsoHcalFromHitsExtractorBlock) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py index 3ddd1055df9d2..38eed5f98c889 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py @@ -3,7 +3,7 @@ from RecoEgamma.EgammaIsolationAlgos.eleHcalExtractorBlocks_cff import * eleIsoDepositHcalFromTowers = cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), trackType = cms.string('candidate'), MultipleDepositsFlag = cms.bool(False), ExtractorPSet = cms.PSet(EleIsoHcalFromTowersExtractorBlock) @@ -12,7 +12,7 @@ #next two seperate out the hcal depths in the endcap #note that by defination hcal depth 1 + hcal depth 2 = hcal eleIsoDepositHcalDepth1FromTowers= cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), MultipleDepositsFlag = cms.bool(False), trackType = cms.string('candidate'), ExtractorPSet = cms.PSet( EleIsoHcalFromTowersExtractorBlock ) @@ -20,7 +20,7 @@ eleIsoDepositHcalDepth1FromTowers.ExtractorPSet.hcalDepth = cms.int32(1) eleIsoDepositHcalDepth2FromTowers = cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), MultipleDepositsFlag = cms.bool(False), trackType = cms.string('candidate'), ExtractorPSet = cms.PSet( EleIsoHcalFromTowersExtractorBlock ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositTk_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositTk_cff.py index bd4fbbc49c726..710373974f686 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositTk_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositTk_cff.py @@ -3,7 +3,7 @@ from RecoEgamma.EgammaIsolationAlgos.eleTrackExtractorBlocks_cff import * eleIsoDepositTk = cms.EDProducer("CandIsoDepositProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), trackType = cms.string('candidate'), MultipleDepositsFlag = cms.bool(False), ExtractorPSet = cms.PSet(EleIsoTrackExtractorBlock) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationLcone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationLcone_cfi.py index 5bf8c7949994c..2d9ff68bcfaac 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationLcone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationLcone_cfi.py @@ -26,7 +26,7 @@ subtract = cms.bool(False), vetoClustered = cms.bool(False), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationScone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationScone_cfi.py index 06d72ffbb065e..6477d88699d1b 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationScone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronEcalRecHitIsolationScone_cfi.py @@ -26,7 +26,7 @@ subtract = cms.bool(False), vetoClustered = cms.bool(False), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationLcone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationLcone_cfi.py index 52659319a0df4..d851dc3ac1ce0 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationLcone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationLcone_cfi.py @@ -7,7 +7,7 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(-1), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) @@ -18,7 +18,7 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(1), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) electronHcalDepth2TowerIsolationLcone = cms.EDProducer("EgammaTowerIsolationProducer", @@ -28,5 +28,5 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(2), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationScone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationScone_cfi.py index 49331e49d3e0b..9559608b8a84f 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationScone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronHcalTowerIsolationScone_cfi.py @@ -7,7 +7,7 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(-1), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) @@ -18,7 +18,7 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(1), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) electronHcalDepth2TowerIsolationScone = cms.EDProducer("EgammaTowerIsolationProducer", @@ -28,6 +28,6 @@ towerProducer = cms.InputTag("towerMaker"), etMin = cms.double(0.0), Depth = cms.int32(2), - emObjectProducer = cms.InputTag("gsfElectrons") + emObjectProducer = cms.InputTag("gedGsfElectrons") ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationLcone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationLcone_cfi.py index 0b2bdfb252edd..6c54e5ef82e7e 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationLcone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationLcone_cfi.py @@ -7,7 +7,7 @@ intRadiusEndcap = cms.double(0.015), stripBarrel = cms.double(0.015), stripEndcap = cms.double(0.015), - electronProducer = cms.InputTag("gsfElectrons"), + electronProducer = cms.InputTag("gedGsfElectrons"), extRadius = cms.double(0.4), ptMin = cms.double(0.7), maxVtxDist = cms.double(0.2), diff --git a/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationScone_cfi.py b/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationScone_cfi.py index 220b5c988bb0b..08bab5b07b542 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationScone_cfi.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/electronTrackIsolationScone_cfi.py @@ -7,7 +7,7 @@ intRadiusEndcap = cms.double(0.015), stripBarrel = cms.double(0.015), stripEndcap = cms.double(0.015), - electronProducer = cms.InputTag("gsfElectrons"), + electronProducer = cms.InputTag("gedGsfElectrons"), extRadius = cms.double(0.3), ptMin = cms.double(0.7), maxVtxDist = cms.double(0.2), diff --git a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py index 75bed4345846d..b08a252e098b7 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py @@ -5,24 +5,44 @@ import RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff -interestingEleIsoDetIdEB = RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff.interestingEleIsoDetId.clone() -interestingEleIsoDetIdEB.recHitsLabel = 'ecalRecHit:EcalRecHitsEB' -interestingEleIsoDetIdEB.emObjectLabel = 'gsfElectrons' -interestingEleIsoDetIdEB.etCandCut = 0.0 -interestingEleIsoDetIdEB.energyCut = 0.095 -interestingEleIsoDetIdEB.etCut = 0.0 -interestingEleIsoDetIdEB.outerRadius = 0.6 -interestingEleIsoDetIdEB.innerRadius = 0.0 +interestingGedEleIsoDetIdEB = RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff.interestingEleIsoDetId.clone() +interestingGedEleIsoDetIdEB.recHitsLabel = 'ecalRecHit:EcalRecHitsEB' +interestingGedEleIsoDetIdEB.emObjectLabel = 'gedGsfElectrons' +interestingGedEleIsoDetIdEB.etCandCut = 0.0 +interestingGedEleIsoDetIdEB.energyCut = 0.095 +interestingGedEleIsoDetIdEB.etCut = 0.0 +interestingGedEleIsoDetIdEB.outerRadius = 0.6 +interestingGedEleIsoDetIdEB.innerRadius = 0.0 import RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff -interestingEleIsoDetIdEE = RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff.interestingEleIsoDetId.clone() -interestingEleIsoDetIdEE.recHitsLabel = 'ecalRecHit:EcalRecHitsEE' -interestingEleIsoDetIdEE.emObjectLabel = 'gsfElectrons' -interestingEleIsoDetIdEE.etCandCut = 0.0 -interestingEleIsoDetIdEE.energyCut = 0.0 -interestingEleIsoDetIdEE.etCut = 0.110 -interestingEleIsoDetIdEE.outerRadius = 0.6 -interestingEleIsoDetIdEE.innerRadius = 0.0 +interestingGedEleIsoDetIdEE = RecoEgamma.EgammaIsolationAlgos.interestingEleIsoDetIdModule_cff.interestingEleIsoDetId.clone() +interestingGedEleIsoDetIdEE.recHitsLabel = 'ecalRecHit:EcalRecHitsEE' +interestingGedEleIsoDetIdEE.emObjectLabel = 'gedGsfElectrons' +interestingGedEleIsoDetIdEE.etCandCut = 0.0 +interestingGedEleIsoDetIdEE.energyCut = 0.0 +interestingGedEleIsoDetIdEE.etCut = 0.110 +interestingGedEleIsoDetIdEE.outerRadius = 0.6 +interestingGedEleIsoDetIdEE.innerRadius = 0.0 + +import RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff +interestingGedGamIsoDetIdEB = RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff.interestingGamIsoDetId.clone() +interestingGedGamIsoDetIdEB.recHitsLabel = 'ecalRecHit:EcalRecHitsEB' +interestingGedGamIsoDetIdEB.emObjectLabel = 'gedPhotons' +interestingGedGamIsoDetIdEB.etCandCut = 0.0 +interestingGedGamIsoDetIdEB.energyCut = 0.095 +interestingGedGamIsoDetIdEB.etCut = 0.0 +interestingGedGamIsoDetIdEB.outerRadius = 0.6 +interestingGedGamIsoDetIdEB.innerRadius = 0.0 + +import RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff +interestingGedGamIsoDetIdEE = RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff.interestingGamIsoDetId.clone() +interestingGedGamIsoDetIdEE.recHitsLabel = 'ecalRecHit:EcalRecHitsEE' +interestingGedGamIsoDetIdEE.emObjectLabel = 'gedPhotons' +interestingGedGamIsoDetIdEE.etCandCut = 0.0 +interestingGedGamIsoDetIdEE.energyCut = 0.0 +interestingGedGamIsoDetIdEE.etCut = 0.110 +interestingGedGamIsoDetIdEE.outerRadius = 0.6 +interestingGedGamIsoDetIdEE.innerRadius = 0.0 import RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff interestingGamIsoDetIdEB = RecoEgamma.EgammaIsolationAlgos.interestingGamIsoDetIdModule_cff.interestingGamIsoDetId.clone() @@ -45,8 +65,10 @@ interestingGamIsoDetIdEE.innerRadius = 0.0 interestingEgammaIsoDetIds = cms.Sequence( - interestingEleIsoDetIdEB * - interestingEleIsoDetIdEE * + interestingGedEleIsoDetIdEB * + interestingGedEleIsoDetIdEE * + interestingGedGamIsoDetIdEB * + interestingGedGamIsoDetIdEE * interestingGamIsoDetIdEB * interestingGamIsoDetIdEE ) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/interestingEleIsoDetIdModule_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/interestingEleIsoDetIdModule_cff.py index ce6c686d1b6ab..51f41d1a8c430 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/interestingEleIsoDetIdModule_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/interestingEleIsoDetIdModule_cff.py @@ -5,7 +5,7 @@ interestingEleIsoDetId = cms.EDProducer("EleIsoDetIdCollectionProducer", recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"), - emObjectLabel = cms.InputTag("gsfElectrons"), + emObjectLabel = cms.InputTag("gedGsfElectrons"), etCandCut = cms.double(0.0), energyCut = cms.double(0.040), etCut = cms.double(0), diff --git a/RecoEgamma/EgammaPhotonProducers/python/allConversionSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/allConversionSequence_cff.py index 62aab695ff13b..17c3f649387c8 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/allConversionSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/allConversionSequence_cff.py @@ -6,11 +6,11 @@ from RecoEgamma.EgammaPhotonProducers.allConversions_cfi import * allConversionSequence = cms.Sequence(allConversions) -allConversionsMustache = allConversions.clone() -allConversionsMustache.scBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') -allConversionsMustache.bcBarrelCollection = cms.InputTag('particleFlowClusterECAL') -allConversionsMustache.scEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') -allConversionsMustache.bcEndcapCollection = cms.InputTag('particleFlowClusterECAL') +allConversionsOldEG = allConversions.clone() +allConversionsOldEG.scBarrelProducer = cms.InputTag("correctedHybridSuperClusters") +allConversionsOldEG.bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters") +allConversionsOldEG.scEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower") +allConversionsOldEG.bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters") -allConversionMustacheSequence = cms.Sequence(allConversionsMustache) +allConversionOldEGSequence = cms.Sequence(allConversionsOldEG) diff --git a/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py index 5bea536e64883..06ba659d5546f 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py @@ -6,10 +6,10 @@ src = cms.InputTag("gsfGeneralInOutOutInConversionTrackMerger"), convertedPhotonCollection = cms.string(''), ## or empty - bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters"), - bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters"), - scBarrelProducer = cms.InputTag("correctedHybridSuperClusters"), - scEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), + bcEndcapCollection = cms.InputTag('particleFlowClusterECAL'), + bcBarrelCollection = cms.InputTag('particleFlowClusterECAL'), + scBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel'), + scEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower'), primaryVertexProducer = cms.InputTag('offlinePrimaryVerticesWithBS'), diff --git a/RecoEgamma/EgammaPhotonProducers/python/conversionSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/conversionSequence_cff.py index 1be48f0838c5d..12ae35fb48ed0 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/conversionSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/conversionSequence_cff.py @@ -10,11 +10,11 @@ #conversionSequence = cms.Sequence(ckfTracksFromConversions*conversions) conversionSequence = cms.Sequence(conversions) -mustacheConversions = conversions.clone() -mustacheConversions.scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') -mustacheConversions.bcBarrelCollection = cms.InputTag('particleFlowClusterECAL') -mustacheConversions.scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') -mustacheConversions.bcEndcapCollection = cms.InputTag('particleFlowClusterECAL') -mustacheConversions.conversionIOTrackProducer = cms.string('ckfInOutTracksFromMustacheConversions') -mustacheConversions.conversionOITrackProducer = cms.string('ckfOutInTracksFromMustacheConversions') -mustacheConversionSequence = cms.Sequence(mustacheConversions) +oldegConversions = conversions.clone() +oldegConversions.scHybridBarrelProducer = cms.InputTag("correctedHybridSuperClusters") +oldegConversions.bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters") +oldegConversions.scIslandEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower") +oldegConversions.bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters") +oldegConversions.conversionIOTrackProducer = cms.string('ckfInOutTracksFromOldEGConversions') +oldegConversions.conversionOITrackProducer = cms.string('ckfOutInTracksFromOldEGConversions') +oldegConversionSequence = cms.Sequence(oldegConversions) diff --git a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py index b3915bff2eb1a..f80628836fea4 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py @@ -29,10 +29,10 @@ conversionTrackCandidates = cms.EDProducer("ConversionTrackCandidateProducer", # beamSpot = cms.InputTag("offlineBeamSpot"), - bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters"), - bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters"), - scHybridBarrelProducer = cms.InputTag("correctedHybridSuperClusters"), - scIslandEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), + bcBarrelCollection = cms.InputTag('particleFlowClusterECAL'), + bcEndcapCollection = cms.InputTag('particleFlowClusterECAL'), + scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel'), + scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower'), outInTrackCandidateSCAssociationCollection = cms.string('outInTrackCandidateSCAssociationCollection'), inOutTrackCandidateSCAssociationCollection = cms.string('inOutTrackCandidateSCAssociationCollection'), inOutTrackCandidateCollection = cms.string('inOutTracksFromConversions'), diff --git a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/conversionTrackSequence_cff.py index 1d6051f0ee12a..80b8be93434bd 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/conversionTrackSequence_cff.py @@ -11,23 +11,23 @@ ckfTracksFromConversions = cms.Sequence(conversionTrackCandidates*ckfOutInTracksFromConversions*ckfInOutTracksFromConversions) -mustacheConversionTrackCandidates = conversionTrackCandidates.clone() -mustacheConversionTrackCandidates.scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') -mustacheConversionTrackCandidates.bcBarrelCollection = cms.InputTag('particleFlowClusterECAL') -mustacheConversionTrackCandidates.scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') -mustacheConversionTrackCandidates.bcEndcapCollection = cms.InputTag('particleFlowClusterECAL') +oldegConversionTrackCandidates = conversionTrackCandidates.clone() +oldegConversionTrackCandidates.scHybridBarrelProducer = cms.InputTag("correctedHybridSuperClusters") +oldegConversionTrackCandidates.bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters") +oldegConversionTrackCandidates.scIslandEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower") +oldegConversionTrackCandidates.bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters") -ckfOutInTracksFromMustacheConversions = ckfOutInTracksFromConversions.clone() -ckfOutInTracksFromMustacheConversions.src = cms.InputTag('mustacheConversionTrackCandidates','outInTracksFromConversions') -ckfOutInTracksFromMustacheConversions.producer = cms.string('mustacheConversionTrackCandidates') -ckfOutInTracksFromMustacheConversions.ComponentName = cms.string('ckfOutInTracksFromMustacheConversions') +ckfOutInTracksFromOldEGConversions = ckfOutInTracksFromConversions.clone() +ckfOutInTracksFromOldEGConversions.src = cms.InputTag('oldegConversionTrackCandidates','outInTracksFromConversions') +ckfOutInTracksFromOldEGConversions.producer = cms.string('oldegConversionTrackCandidates') +ckfOutInTracksFromOldEGConversions.ComponentName = cms.string('ckfOutInTracksFromOldEGConversions') -ckfInOutTracksFromMustacheConversions = ckfInOutTracksFromConversions.clone() -ckfInOutTracksFromMustacheConversions.src = cms.InputTag('mustacheConversionTrackCandidates','inOutTracksFromConversions') -ckfInOutTracksFromMustacheConversions.producer = cms.string('mustacheConversionTrackCandidates') -ckfInOutTracksFromMustacheConversions.ComponentName = cms.string('ckfInOutTracksFromMustacheConversions') +ckfInOutTracksFromOldEGConversions = ckfInOutTracksFromConversions.clone() +ckfInOutTracksFromOldEGConversions.src = cms.InputTag('oldegConversionTrackCandidates','inOutTracksFromConversions') +ckfInOutTracksFromOldEGConversions.producer = cms.string('oldegConversionTrackCandidates') +ckfInOutTracksFromOldEGConversions.ComponentName = cms.string('ckfInOutTracksFromOldEGConversions') -ckfTracksFromMustacheConversions = cms.Sequence(mustacheConversionTrackCandidates*ckfOutInTracksFromMustacheConversions*ckfInOutTracksFromMustacheConversions) +ckfTracksFromOldEGConversions = cms.Sequence(oldegConversionTrackCandidates*ckfOutInTracksFromOldEGConversions*ckfInOutTracksFromOldEGConversions) #producer from general tracks collection, set tracker only, merged arbitrated, merged arbitrated ecal/general flags generalConversionTrackProducer = RecoEgamma.EgammaPhotonProducers.conversionTrackProducer_cfi.conversionTrackProducer.clone( @@ -66,12 +66,12 @@ conversionTrackProducers = cms.Sequence(generalConversionTrackProducer*conversionStepConversionTrackProducer*inOutConversionTrackProducer*outInConversionTrackProducer*gsfConversionTrackProducer) -inOutMustacheConversionTrackProducer = inOutConversionTrackProducer.clone() -inOutMustacheConversionTrackProducer.TrackProducer = cms.string('ckfInOutTracksFromMustacheConversions') -outInMustacheConversionTrackProducer = outInConversionTrackProducer.clone() -outInMustacheConversionTrackProducer.TrackProducer = cms.string('ckfOutInTracksFromMustacheConversions') +inOutOldEGConversionTrackProducer = inOutConversionTrackProducer.clone() +inOutOldEGConversionTrackProducer.TrackProducer = cms.string('ckfInOutTracksFromOldEGConversions') +outInOldEGConversionTrackProducer = outInConversionTrackProducer.clone() +outInOldEGConversionTrackProducer.TrackProducer = cms.string('ckfOutInTracksFromOldEGConversions') -mustacheConversionTrackProducers = cms.Sequence(inOutMustacheConversionTrackProducer*outInMustacheConversionTrackProducer) +oldegConversionTrackProducers = cms.Sequence(inOutOldEGConversionTrackProducer*outInOldEGConversionTrackProducer) #merge generalTracks and conversionStepTracks collections, with arbitration by nhits then chi^2/ndof for ecalseededarbitrated, mergedarbitratedecalgeneral and mergedarbitrated flags generalConversionStepConversionTrackMerger = RecoEgamma.EgammaPhotonProducers.conversionTrackMerger_cfi.conversionTrackMerger.clone( @@ -130,17 +130,17 @@ conversionTrackMergers = cms.Sequence(inOutOutInConversionTrackMerger*generalConversionStepConversionTrackMerger*generalInOutOutInConversionTrackMerger*gsfGeneralInOutOutInConversionTrackMerger) -inOutOutInMustacheConversionTrackMerger = inOutOutInConversionTrackMerger.clone() -inOutOutInMustacheConversionTrackMerger.TrackProducer1 = cms.InputTag('inOutMustacheConversionTrackProducer') -inOutOutInMustacheConversionTrackMerger.TrackProducer2 = cms.InputTag('outInMustacheConversionTrackProducer') +inOutOutInOldEGConversionTrackMerger = inOutOutInConversionTrackMerger.clone() +inOutOutInOldEGConversionTrackMerger.TrackProducer1 = cms.InputTag('inOutOldEGConversionTrackProducer') +inOutOutInOldEGConversionTrackMerger.TrackProducer2 = cms.InputTag('outInOldEGConversionTrackProducer') -generalInOutOutInMustacheConversionTrackMerger = generalInOutOutInConversionTrackMerger.clone() -generalInOutOutInMustacheConversionTrackMerger.TrackProducer1 = cms.InputTag('inOutOutInMustacheConversionTrackMerger') +generalInOutOutInOldEGConversionTrackMerger = generalInOutOutInConversionTrackMerger.clone() +generalInOutOutInOldEGConversionTrackMerger.TrackProducer1 = cms.InputTag('inOutOutInOldEGConversionTrackMerger') -gsfGeneralInOutOutInMustacheConversionTrackMerger = gsfGeneralInOutOutInConversionTrackMerger.clone() -gsfGeneralInOutOutInMustacheConversionTrackMerger.TrackProducer1 = cms.InputTag('generalInOutOutInMustacheConversionTrackMerger') +gsfGeneralInOutOutInOldEGConversionTrackMerger = gsfGeneralInOutOutInConversionTrackMerger.clone() +gsfGeneralInOutOutInOldEGConversionTrackMerger.TrackProducer1 = cms.InputTag('generalInOutOutInOldEGConversionTrackMerger') -mustacheConversionTrackMergers = cms.Sequence(inOutOutInMustacheConversionTrackMerger*generalInOutOutInMustacheConversionTrackMerger*gsfGeneralInOutOutInMustacheConversionTrackMerger) +oldegConversionTrackMergers = cms.Sequence(inOutOutInOldEGConversionTrackMerger*generalInOutOutInOldEGConversionTrackMerger*gsfGeneralInOutOutInOldEGConversionTrackMerger) conversionTrackSequence = cms.Sequence(ckfTracksFromConversions*conversionTrackProducers*conversionTrackMergers) diff --git a/RecoEgamma/EgammaPhotonProducers/python/conversions_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/conversions_cfi.py index b1d33e8900be4..a31770f444170 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/conversions_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/conversions_cfi.py @@ -6,10 +6,10 @@ # # conversions = cms.EDProducer("ConvertedPhotonProducer", - scHybridBarrelProducer = cms.InputTag("correctedHybridSuperClusters"), - scIslandEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), - bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters"), - bcBarrelCollection = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters"), + scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel'), + scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower'), + bcEndcapCollection = cms.InputTag('particleFlowClusterECAL'), + bcBarrelCollection = cms.InputTag('particleFlowClusterECAL'), conversionIOTrackProducer = cms.string('ckfInOutTracksFromConversions'), outInTrackCollection = cms.string(''), conversionOITrackProducer = cms.string('ckfOutInTracksFromConversions'), diff --git a/RecoEgamma/EgammaPhotonProducers/python/gedPhotons_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/gedPhotons_cfi.py index d3eff37084b8b..d5b414783b236 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/gedPhotons_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/gedPhotons_cfi.py @@ -6,47 +6,6 @@ from RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi import * from RecoEcal.EgammaClusterProducers.multi5x5BasicClusters_cfi import * -from CondCore.DBCommon.CondDBCommon_cfi import CondDBCommon - -gedphotonGBRESSource = cms.ESSource( - "PoolDBESSource", - CondDBCommon, - DumpStat=cms.untracked.bool(False), - toGet = cms.VPSet( - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedphoton_EBCorrection_offline'), - label = cms.untracked.string('gedphoton_EBCorrection_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedphoton_EECorrection_offline'), - label = cms.untracked.string('gedphoton_EECorrection_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedphoton_EBUncertainty_offline'), - label = cms.untracked.string('gedphoton_EBUncertainty_offline') - ), - cms.PSet( - record = cms.string('GBRWrapperRcd'), - tag = cms.string('gedphoton_EEUncertainty_offline'), - label = cms.untracked.string('gedphoton_EEUncertainty_offline') - ), - ) -) -gedphotonGBRESSource.connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000') - -gedphotonPrefer = cms.ESPrefer( - 'PoolDBESSource', - 'gedphotonGBRESSource', - GBRWrapperRcd = cms.vstring('GBRForest/gedphoton_EBCorrection_offline', - 'GBRForest/gedphoton_EECorrection_offline', - 'GBRForest/gedphoton_EBUncertainty_offline', - 'GBRForest/gedphoton_EEUncertainty_offline') -) - - # # producer for photons # diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py index 4f8deec661117..e542484724a4f 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py @@ -5,7 +5,7 @@ # producer for photonCore collection # photonCore = cms.EDProducer("PhotonCoreProducer", - conversionProducer = cms.InputTag("conversions"), + conversionProducer = cms.InputTag(""), # conversionCollection = cms.string(''), scHybridBarrelProducer = cms.InputTag("correctedHybridSuperClusters"), scIslandEndcapProducer = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py index c81fe18038086..23794694989b9 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py @@ -6,13 +6,14 @@ # photon producer from RecoEgamma.EgammaPhotonProducers.photonCore_cfi import * from RecoEgamma.EgammaPhotonProducers.photons_cfi import * -photonSequence = cms.Sequence( photonCore + photons ) + mustachePhotonCore = photonCore.clone() mustachePhotonCore.scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel') mustachePhotonCore.scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower') -mustachePhotonCore.conversionProducer = cms.InputTag('mustacheConversions') +mustachePhotonCore.conversionProducer = cms.InputTag('conversions') mustachePhotons = photons.clone() mustachePhotons.photonCoreProducer = cms.InputTag('mustachePhotonCore') mustachePhotonSequence = cms.Sequence( mustachePhotonCore + mustachePhotons ) +photonSequence = cms.Sequence( photonCore + photons + mustachePhotonSequence ) diff --git a/RecoEgamma/EgammaTools/test/GBRWrapperMaker.cc b/RecoEgamma/EgammaTools/test/GBRWrapperMaker.cc index ad51fbf89b6ec..a0e29f9cf0e4f 100644 --- a/RecoEgamma/EgammaTools/test/GBRWrapperMaker.cc +++ b/RecoEgamma/EgammaTools/test/GBRWrapperMaker.cc @@ -116,14 +116,14 @@ GBRWrapperMaker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup // iSetup.get().get(pSetup); // #endif //from Josh: - TFile *infile = new TFile("/afs/cern.ch/user/l/lgray/work/public/CMSSW_7_0_0_pre4/src/RecoEgamma/EgammaTools/test/GBR_Clustering_PFMustache_results.root","READ"); + TFile *infile = new TFile("eleEnergyRegWeights_WithSubClusters_VApr15.root","READ"); printf("load forest\n"); - GBRForest *gbreb = (GBRForest*)infile->Get("EBCorrection"); - //GBRForest *gbrebvar = (GBRForest*)infile->Get("EBUncertainty"); - GBRForest *gbree = (GBRForest*)infile->Get("EECorrection"); + GBRForest *p4comb = (GBRForest*)infile->Get("CombinationWeight"); + //GBRForest *gbbrebvar = (GBRForest*)infile->Get("EBUncertainty"); + //GBRForest *gbree = (GBRForest*)infile->Get("EECorrection"); //GBRForest *gbreevar = (GBRForest*)infile->Get("EEUncertainty"); @@ -147,12 +147,12 @@ GBRWrapperMaker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup edm::Service poolDbService; if (poolDbService.isAvailable()) { - poolDbService->writeOne( gbreb, poolDbService->beginOfTime(), - "pfecalsc_EBCorrection" ); + poolDbService->writeOne( p4comb, poolDbService->beginOfTime(), + "gedelectron_p4combination" ); //poolDbService->writeOne( gbrebvar, poolDbService->beginOfTime(), //"wgbrph_EBUncertainty" ); - poolDbService->writeOne( gbree, poolDbService->beginOfTime(), - "pfecalsc_EECorrection" ); + //poolDbService->writeOne( gbree, poolDbService->beginOfTime(), + //"pfecalsc_EECorrection" ); //poolDbService->writeOne( gbreevar, poolDbService->beginOfTime(), // "wgbrph_EEUncertainty" ); diff --git a/RecoEgamma/EgammaTools/test/gbrwrappermaker_cfg.py b/RecoEgamma/EgammaTools/test/gbrwrappermaker_cfg.py index 27a1e2bdd3ca3..c0c394279dfb4 100644 --- a/RecoEgamma/EgammaTools/test/gbrwrappermaker_cfg.py +++ b/RecoEgamma/EgammaTools/test/gbrwrappermaker_cfg.py @@ -27,7 +27,7 @@ process.load("CondCore.DBCommon.CondDBCommon_cfi") # output database (in this case local sqlite file) -process.CondDBCommon.connect = 'sqlite_file:GBRWrapper.db' +process.CondDBCommon.connect = 'sqlite_file:gedelectron_p4combination_14122013.db' process.PoolDBOutputService = cms.Service("PoolDBOutputService", @@ -35,13 +35,9 @@ timetype = cms.untracked.string('runnumber'), toPut = cms.VPSet( cms.PSet( - record = cms.string('pfecalsc_EBCorrection'), - tag = cms.string('pfecalsc_EBCorrection') - ), - cms.PSet( - record = cms.string('pfecalsc_EECorrection'), - tag = cms.string('pfecalsc_EECorrection') - ), + record = cms.string('gedelectron_p4combination'), + tag = cms.string('gedelectron_p4combination') + ) ) ) diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBasedExt_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBasedExt_cfi.py index eb444afd6ca87..7634d2acb81b4 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBasedExt_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBasedExt_cfi.py @@ -2,7 +2,7 @@ eidCutBasedClassBasedExt = cms.EDProducer("EleIdCutBasedExtProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), algorithm = cms.string('eIDClassBased'), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBased_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBased_cfi.py index 337ad6c79750e..9274b258c3a08 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBased_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassBased_cfi.py @@ -2,7 +2,7 @@ eidCutBasedClassBased = cms.EDProducer("EleIdCutBasedRef", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), algorithm = cms.string('eIDClassBased'), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassesExt_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassesExt_cfi.py index d9d40662e10fe..bc1dc0614f6a6 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassesExt_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClassesExt_cfi.py @@ -2,7 +2,7 @@ eidCutBasedClassesExt = cms.EDProducer("EleIdCutBasedExtProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), algorithm = cms.string('eIDCBClasses'), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClasses_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClasses_cfi.py index 5180764f375db..c7faa39379784 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClasses_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedClasses_cfi.py @@ -5,7 +5,7 @@ filter = cms.bool(False), threshold = cms.double(0.5), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), algorithm = cms.string('eIDCBClasses'), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedExt_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedExt_cfi.py index f67463c5ff2cc..92914bf047c06 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBasedExt_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBasedExt_cfi.py @@ -2,7 +2,7 @@ eidCutBasedExt = cms.EDProducer("EleIdCutBasedExtProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), verticesCollection = cms.InputTag("offlinePrimaryVerticesWithBS"), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdCutBased_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdCutBased_cfi.py index 8ef80e65f8624..0ba15349ee188 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdCutBased_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdCutBased_cfi.py @@ -5,7 +5,7 @@ filter = cms.bool(False), threshold = cms.double(0.5), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), verticesCollection = cms.InputTag("offlinePrimaryVerticesWithBS"), reducedBarrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdLikelihoodExt_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdLikelihoodExt_cfi.py index 5978ac01eafbd..65fdffacbfaa5 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdLikelihoodExt_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdLikelihoodExt_cfi.py @@ -3,7 +3,7 @@ from RecoEgamma.ElectronIdentification.likelihoodPdfsDB_cfi import * from RecoEgamma.ElectronIdentification.likelihoodESetup_cfi import * eidLikelihoodExt = cms.EDProducer("EleIdLikelihoodExtProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("reducedEcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("reducedEcalRecHitsEE"), doLikelihood = cms.bool(True) diff --git a/RecoEgamma/ElectronIdentification/python/electronIdLikelihood_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdLikelihood_cfi.py index ddaef85372483..ce21219b49c6f 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdLikelihood_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdLikelihood_cfi.py @@ -5,7 +5,7 @@ eidLikelihood = cms.EDFilter("EleIdLikelihoodRef", filter = cms.bool(False), threshold = cms.double(0.5), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), reducedBarrelRecHitCollection = cms.InputTag("reducedEcalRecHitsEB"), reducedEndcapRecHitCollection = cms.InputTag("reducedEcalRecHitsEE"), doLikelihood = cms.bool(True) diff --git a/RecoEgamma/ElectronIdentification/python/electronIdMVABased_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdMVABased_cfi.py index 323829022d034..aed524606477e 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdMVABased_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdMVABased_cfi.py @@ -2,7 +2,7 @@ mvaElectrons = cms.EDFilter("ElectronIdMVABased", vertexTag = cms.InputTag('offlinePrimaryVertices'), - electronTag = cms.InputTag('gsfElectrons'), + electronTag = cms.InputTag('gedGsfElectrons'), HZZmvaWeightFile = cms.string('RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml'), thresholdBarrel = cms.double( -0.1875 ), thresholdEndcap = cms.double( -0.1075 ), diff --git a/RecoEgamma/ElectronIdentification/python/electronIdNeuralNetExt_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdNeuralNetExt_cfi.py index 0b00e207ab002..8623ed2974809 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdNeuralNetExt_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdNeuralNetExt_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms eidNeuralNetExt = cms.EDProducer("EleIdNeuralNetExtProducer", - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), doNeuralNet = cms.bool(True), weightsDir = cms.string(''), NN_set = cms.string('ZeeZmumuJets-2500ev') diff --git a/RecoEgamma/ElectronIdentification/python/electronIdNeuralNet_cfi.py b/RecoEgamma/ElectronIdentification/python/electronIdNeuralNet_cfi.py index e91855f987b6e..55502f2201c3d 100644 --- a/RecoEgamma/ElectronIdentification/python/electronIdNeuralNet_cfi.py +++ b/RecoEgamma/ElectronIdentification/python/electronIdNeuralNet_cfi.py @@ -3,7 +3,7 @@ eidNeuralNet = cms.EDFilter("EleIdNeuralNetRef", filter = cms.bool(False), threshold = cms.double(0.5), - src = cms.InputTag("gsfElectrons"), + src = cms.InputTag("gedGsfElectrons"), doNeuralNet = cms.bool(True), weightsDir = cms.string(''), NN_set = cms.string('ZeeZmumuJets-2500ev') diff --git a/RecoEgamma/PhotonIdentification/python/photonId_cff.py b/RecoEgamma/PhotonIdentification/python/photonId_cff.py index 160584e6cd46c..1247315469378 100644 --- a/RecoEgamma/PhotonIdentification/python/photonId_cff.py +++ b/RecoEgamma/PhotonIdentification/python/photonId_cff.py @@ -3,5 +3,6 @@ # Producer for Hybrid BasicClusters and SuperClusters from RecoEgamma.PhotonIdentification.photonId_cfi import * # photonID sequence +PhotonIDProdGED = PhotonIDProd.clone(photonProducer = cms.string('gedPhotons')) photonIDSequence = cms.Sequence(PhotonIDProd) - +photonIDSequenceGED = cms.Sequence(PhotonIDProdGED) diff --git a/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cfi.py b/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cfi.py index e36d9f0d0bdf7..e3671e080ff42 100644 --- a/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cfi.py +++ b/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cfi.py @@ -33,7 +33,7 @@ # Electrons UseElectrons = cms.bool(True), - Electrons = cms.InputTag("gsfElectrons"), + Electrons = cms.InputTag("gedGsfElectrons"), ElectronIds = cms.InputTag("JPTeidTight"), # Filtering tracks using quality diff --git a/RecoMET/METProducers/python/TCMET_cfi.py b/RecoMET/METProducers/python/TCMET_cfi.py index a58e21f11b934..2043553cec6a6 100644 --- a/RecoMET/METProducers/python/TCMET_cfi.py +++ b/RecoMET/METProducers/python/TCMET_cfi.py @@ -5,7 +5,7 @@ "TCMETProducer", alias = cms.string('TCMET'), electronVetoCone = cms.bool(True), - electronInputTag = cms.InputTag("gsfElectrons"), + electronInputTag = cms.InputTag("gedGsfElectrons"), muonInputTag = cms.InputTag("muons"), trackInputTag = cms.InputTag("generalTracks"), metInputTag = cms.InputTag("met"), diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py index 9360c643bf0d5..8cca17186bb0f 100644 --- a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py +++ b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py @@ -28,8 +28,6 @@ particleFlowTmp* particleFlowTmpPtrs* particleFlowEGammaFinal* - pfElectronTranslatorSequence* - pfPhotonTranslatorSequence* pfParticleSelectionSequence ) particleFlowLinks = cms.Sequence( particleFlow*particleFlowPtrs*particleBasedIsolationSequence) diff --git a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py index 8d8ea760ca60f..a555c9247cb75 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py +++ b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py @@ -19,13 +19,13 @@ PFClustersHFEM = cms.InputTag("particleFlowClusterHFEM"), PFClustersHFHAD = cms.InputTag("particleFlowClusterHFHAD"), PFClustersPS = cms.InputTag("particleFlowClusterPS"), - EGPhotons = cms.InputTag("photons"), + EGPhotons = cms.InputTag("mustachePhotons"), #disable dierct import of SuperCluster collections for now until effect on blocks can be #evaluated useSuperClusters = cms.bool(False), #current egamma superclusters - SCBarrel = cms.InputTag("correctedHybridSuperClusters"), - SCEndcap = cms.InputTag("correctedMulti5x5SuperClustersWithPreshower"), + SCBarrel = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel'), + SCEndcap = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower'), #pfbox superclusters, will switch to this in the near future #SCBarrel = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel"), #SCEndcap = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower"), diff --git a/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py index 27b3ae3afb757..b83a10737ed5e 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py +++ b/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py @@ -24,13 +24,13 @@ useHO = cms.bool(True), # Use electron identification in PFAlgo - usePFElectrons = cms.bool(True), + usePFElectrons = cms.bool(False), pf_electron_output_col=cms.string('electrons'), pf_electronID_mvaWeightFile = cms.string('RecoParticleFlow/PFProducer/data/MVAnalysis_BDT.weights_PfElectrons23Jan_IntToFloat.txt'), pf_electron_mvaCut = cms.double(-0.1), # Use Photon identification in PFAlgo (for now this has NO impact, algo is swicthed off hard-coded - usePFPhotons = cms.bool(True), + usePFPhotons = cms.bool(False), usePhotonReg=cms.bool(False), useRegressionFromDB=cms.bool(True), pf_convID_mvaWeightFile = cms.string('RecoParticleFlow/PFProducer/data/MVAnalysis_BDT.weights_pfConversionAug0411.txt'), @@ -42,7 +42,7 @@ sumPtTrackIsoForPhoton=cms.double(2.0), sumPtTrackIsoSlopeForPhoton=cms.double(0.001), - useEGammaFilters = cms.bool(False), + useEGammaFilters = cms.bool(True), useProtectionsForJetMET = cms.bool(True), # New electron selection cuts for CMSSW_700 electron_iso_pt = cms.double(10.0), diff --git a/RecoParticleFlow/PFProducer/python/pfLinker_cfi.py b/RecoParticleFlow/PFProducer/python/pfLinker_cfi.py index 0eded36b17054..28548ab8abdb6 100644 --- a/RecoParticleFlow/PFProducer/python/pfLinker_cfi.py +++ b/RecoParticleFlow/PFProducer/python/pfLinker_cfi.py @@ -2,8 +2,8 @@ pfLinker = cms.EDProducer("PFLinker", PFCandidate = cms.VInputTag(cms.InputTag("particleFlow")), - GsfElectrons = cms.InputTag("gsfElectrons"), - Photons = cms.InputTag("pfPhotonTranslator:pfphot"), + GsfElectrons = cms.InputTag("gedGsfElectrons"), + Photons = cms.InputTag("gedPhotons"), Muons = cms.InputTag("muons","muons1stStep2muonsMap"), ProducePFCandidates = cms.bool(True), FillMuonRefs = cms.bool(True), diff --git a/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA2_cfi.py b/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA2_cfi.py index 54b07f4b83b75..3d24bb29d1a04 100644 --- a/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA2_cfi.py +++ b/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA2_cfi.py @@ -49,5 +49,5 @@ minMVA1prongStripsWgsfWOpfEleMvaEC = cms.double(0.0), minMVA1prongStripsWgsfWpfEleMvaEC = cms.double(0.0), - srcGsfElectrons = cms.InputTag('gsfElectrons') + srcGsfElectrons = cms.InputTag('gedGsfElectrons') ) diff --git a/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA3_cfi.py b/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA3_cfi.py index 193668271ad15..68814426aec12 100644 --- a/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA3_cfi.py +++ b/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA3_cfi.py @@ -69,5 +69,5 @@ minMVA3prongMatch = cms.double(0.0), minMVA3prongNoMatch = cms.double(0.0), - srcGsfElectrons = cms.InputTag('gsfElectrons') + srcGsfElectrons = cms.InputTag('gedGsfElectrons') ) diff --git a/Validation/Configuration/python/ECALHCAL.py b/Validation/Configuration/python/ECALHCAL.py index 4ff22d48bc7e2..2bbb64044ad8d 100644 --- a/Validation/Configuration/python/ECALHCAL.py +++ b/Validation/Configuration/python/ECALHCAL.py @@ -53,11 +53,20 @@ def customise(process): process.ecalRecHit.recoverEBFE = cms.bool(False) process.ecalRecHit.recoverEEFE = cms.bool(False) - process.reducedEcalRecHitsSequence.remove( process.interestingTrackEcalDetIds ) - # process.local_digireco = cms.Path(process.mix * process.calDigi * process.ecalLocalRecoSequence * process.hbhereco * process.hfreco * process.horeco * (process.ecalClusters+process.caloTowersRec) * process.reducedEcalRecHitsSequence ) - process.local_digireco = cms.Path(process.mix * process.calDigi * process.ecalPacker * process.esDigiToRaw * process.hcalRawData * process.rawDataCollector * process.ecalDigis * process.ecalPreshowerDigis * process.hcalDigis * process.calolocalreco *(process.ecalClustersNoPFBox+process.caloTowersRec) * process.reducedEcalRecHitsSequence ) + process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEB"), + cms.InputTag("interestingEcalDetIdEBU"), + ) + + process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag( + # ecal + cms.InputTag("interestingEcalDetIdEE"), + ) + + process.local_digireco = cms.Path(process.mix * process.calDigi * process.ecalPacker * process.esDigiToRaw * process.hcalRawData * process.rawDataCollector * process.ecalDigis * process.ecalPreshowerDigis * process.hcalDigis * process.calolocalreco *(process.ecalClustersNoPFBox+process.caloTowersRec) * process.reducedEcalRecHitsSequenceEcalOnly ) process.schedule.append(process.local_digireco) diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py index d15a652faeb2e..6fba554db0ab7 100644 --- a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py @@ -30,8 +30,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcFakeValidator"), matchingObjectCollection = cms.InputTag("iterativeCone5GenJets"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py index 3e49aa7b8934a..1763ceb9141c5 100644 --- a/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py @@ -30,8 +30,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcFakeValidator"), matchingObjectCollection = cms.InputTag("iterativeCone5GenJets"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py index c859feacaa478..db1674501a287 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py @@ -35,8 +35,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py index ff56376840f51..d6590d7fc5aa6 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py @@ -35,8 +35,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py index 92e7874cda71d..4873b25803459 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py @@ -30,8 +30,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), diff --git a/Validation/RecoEgamma/python/egammaValidation_cff.py b/Validation/RecoEgamma/python/egammaValidation_cff.py index c19f4de736d81..0fad3b70b9e18 100644 --- a/Validation/RecoEgamma/python/egammaValidation_cff.py +++ b/Validation/RecoEgamma/python/egammaValidation_cff.py @@ -5,7 +5,7 @@ photonValidation.isRunCentrally = True pfPhotonValidation.isRunCentrally = True -oldpfPhotonValidation.isRunCentrally = True +#oldpfPhotonValidation.isRunCentrally = True tkConversionValidation.isRunCentrally = True egammaValidation = cms.Sequence(electronValidationSequence+photonValidationSequence) diff --git a/Validation/RecoEgamma/python/electronConversionRejectionValidator.py b/Validation/RecoEgamma/python/electronConversionRejectionValidator.py index 361bec1642031..262027123243a 100644 --- a/Validation/RecoEgamma/python/electronConversionRejectionValidator.py +++ b/Validation/RecoEgamma/python/electronConversionRejectionValidator.py @@ -7,7 +7,7 @@ OutputFileName = cms.string('ValidationHistos.root'), convProducer = cms.string('allConversions'), conversionCollection = cms.string(''), - gsfElectronProducer = cms.string('gsfElectrons'), + gsfElectronProducer = cms.string('gedGsfElectrons'), gsfElectronCollection = cms.string(''), dqmpath = cms.string('EgammaV/ElectronConversionRejectionValidator/'), Verbosity = cms.untracked.int32(0), diff --git a/Validation/RecoEgamma/python/photonPostProcessor_cff.py b/Validation/RecoEgamma/python/photonPostProcessor_cff.py index 0636b220b5e91..18c6e011901ea 100644 --- a/Validation/RecoEgamma/python/photonPostProcessor_cff.py +++ b/Validation/RecoEgamma/python/photonPostProcessor_cff.py @@ -26,6 +26,6 @@ conversionPostprocessing.batch = cms.bool(False) conversionPostprocessing.standalone = cms.bool(False) -photonPostProcessor = cms.Sequence(photonPostprocessing*pfPhotonPostprocessing*oldpfPhotonPostprocessing*conversionPostprocessing) +photonPostProcessor = cms.Sequence(photonPostprocessing*pfPhotonPostprocessing*conversionPostprocessing) #photonPostProcessor = cms.Sequence(photonPostprocessing*conversionPostprocessing) diff --git a/Validation/RecoEgamma/python/photonValidationSequence_cff.py b/Validation/RecoEgamma/python/photonValidationSequence_cff.py index 99300c8882433..8ce2dbab5945f 100644 --- a/Validation/RecoEgamma/python/photonValidationSequence_cff.py +++ b/Validation/RecoEgamma/python/photonValidationSequence_cff.py @@ -54,6 +54,6 @@ # selectors go in separate "pre-" sequence photonPrevalidationSequence = cms.Sequence(tpSelection*tpSelecForFakeRate*tpSelecForEfficiency) -photonValidationSequence = cms.Sequence(photonValidation*oldpfPhotonValidation*pfPhotonValidation*tkConversionValidation) +photonValidationSequence = cms.Sequence(photonValidation*pfPhotonValidation*tkConversionValidation) diff --git a/Validation/RecoMET/python/METValidation_cfi.py b/Validation/RecoMET/python/METValidation_cfi.py index e15a29373fb2f..c70e09237366d 100644 --- a/Validation/RecoMET/python/METValidation_cfi.py +++ b/Validation/RecoMET/python/METValidation_cfi.py @@ -68,7 +68,7 @@ InputCaloMETLabel = cms.InputTag("met"), InputTrackLabel = cms.InputTag("generalTracks"), InputMuonLabel = cms.InputTag("muons"), - InputElectronLabel = cms.InputTag("gsfElectrons"), + InputElectronLabel = cms.InputTag("gedGsfElectrons"), InputBeamSpotLabel = cms.InputTag("offlineBeamSpot"), sample = cms.untracked.string('NULL'), minhits = cms.int32(6), diff --git a/Validation/RecoTau/python/dataTypes/ValidateTausOnRealData_cff.py b/Validation/RecoTau/python/dataTypes/ValidateTausOnRealData_cff.py index 993ac3ecc2e76..f30e3b9efeacb 100644 --- a/Validation/RecoTau/python/dataTypes/ValidateTausOnRealData_cff.py +++ b/Validation/RecoTau/python/dataTypes/ValidateTausOnRealData_cff.py @@ -21,7 +21,7 @@ CleanedPFJets = cms.EDProducer("TauValJetViewCleaner", srcObject = cms.InputTag( "kinematicSelectedPFJets" ), - srcObjectsToRemove = cms.VInputTag( cms.InputTag("muons"), cms.InputTag("gsfElectrons") ), + srcObjectsToRemove = cms.VInputTag( cms.InputTag("muons"), cms.InputTag("gedGsfElectrons") ), deltaRMin = cms.double(0.15) ) diff --git a/Validation/RecoTau/python/dataTypes/ValidateTausOnRealElectronsData_cff.py b/Validation/RecoTau/python/dataTypes/ValidateTausOnRealElectronsData_cff.py index 2eadc54f1a96f..53d5e11bc9c28 100644 --- a/Validation/RecoTau/python/dataTypes/ValidateTausOnRealElectronsData_cff.py +++ b/Validation/RecoTau/python/dataTypes/ValidateTausOnRealElectronsData_cff.py @@ -19,7 +19,7 @@ selectedElectrons = cms.EDFilter( "TauValElectronSelector", - src = cms.InputTag('gsfElectrons'), + src = cms.InputTag('gedGsfElectrons'), cut = cms.string("pt > 25.0 && abs(eta) < 2.4 && isElectron"), filter = cms.bool(False) )