diff --git a/Configuration/ProcessModifiers/python/egamma_lowPt_exclusive_cff.py b/Configuration/ProcessModifiers/python/egamma_lowPt_exclusive_cff.py new file mode 100644 index 0000000000000..d97112cae14a4 --- /dev/null +++ b/Configuration/ProcessModifiers/python/egamma_lowPt_exclusive_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +egamma_lowPt_exclusive = cms.Modifier() diff --git a/RecoEcal/EgammaClusterProducers/python/ecalDigiSelector_cfi.py b/RecoEcal/EgammaClusterProducers/python/ecalDigiSelector_cfi.py index 9da215549b081..571e38da782f9 100644 --- a/RecoEcal/EgammaClusterProducers/python/ecalDigiSelector_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/ecalDigiSelector_cfi.py @@ -13,3 +13,8 @@ selectedEcalEBDigiCollection = cms.string('selectedEcalEBDigiCollection'), selectedEcalEEDigiCollection = cms.string('selectedEcalEEDigiCollection') ) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(selectDigi, + cluster_pt_thresh = 1.0, + single_cluster_thresh = 1.0) diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py index 18e35853162ff..fcebf68ded310 100644 --- a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py @@ -155,3 +155,10 @@ pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, useDynamicDPhiWindow = False) pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterBarrel = 0.20) pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterEndcap = 0.20) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(particleFlowSuperClusterECAL, + thresh_SCEt = 1.0, + thresh_PFClusterSeedBarrel = 0.5, + thresh_PFClusterSeedEndcap = 0.5) + diff --git a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py index 949ee4e8588e8..b221230dda8c0 100644 --- a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py +++ b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py @@ -195,3 +195,7 @@ pp_on_AA_2018.toModify(reducedEcalRecHitsEE.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingOotGamIsoDetIdEE")) ) pp_on_AA_2018.toModify(reducedEcalRecHitsES.interestingDetIds, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFES")) ) pp_on_AA_2018.toModify(reducedEcalRecHitsES.interestingDetIdsNotToClean, func = lambda list: list.remove(cms.InputTag("interestingOotEgammaIsoESDetId")) ) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(reducedEcalRecHitsES, + scEtThreshold = 1.0) diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py index ae6afde22b6cd..0af5d7fae5b72 100644 --- a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py @@ -98,6 +98,10 @@ SeedConfiguration = dict( allowHGCal = True ) ) +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(ecalDrivenElectronSeeds.SeedConfiguration, + LowPtThreshold =1.0, + applyHOverECut = False) # create ecal driven seeds for electron using HGCal Multiclusters ecalDrivenElectronSeedsFromMultiCl = ecalDrivenElectronSeeds.clone( diff --git a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py index 4df661cb3284c..e5af2dc609e5b 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py @@ -63,3 +63,11 @@ from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 pp_on_AA_2018.toModify(gedGsfElectronsTmp.preselection, minSCEtBarrel = 15.0) pp_on_AA_2018.toModify(gedGsfElectronsTmp.preselection, minSCEtEndcaps = 15.0) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(gedGsfElectronsTmp.preselection, + minSCEtBarrel = 1.0, + minSCEtEndcaps = 1.0) +egamma_lowPt_exclusive.toModify(gedGsfElectronsTmp, + applyPreselection = False) + diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py index df2cd341081b6..bfa0b43f8222a 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py @@ -117,3 +117,11 @@ ecalDrivenGsfElectronsFromMultiCl = ecalDrivenGsfElectrons.clone( gsfElectronCoresTag = "ecalDrivenGsfElectronCoresFromMultiCl", ) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(gsfElectrons.preselection, + minSCEtBarrel = 1.0, + minSCEtEndcaps = 1.0) + +egamma_lowPt_exclusive.toModify(gsfElectrons, + applyPreselection = False) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py index c068b0dd21e5c..7de3e8e910aa8 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py @@ -136,3 +136,15 @@ from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 pp_on_AA_2018.toReplaceWith(interestingEgammaIsoDetIdsTask, _pp_on_AA_interestingEgammaIsoDetIdsTask) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(interestingGedEgammaIsoESDetId, + minSCEt = 1.0, #default 500 + minEleEt = 1.0, #default 20 + minPhoEt = 1.0 #default 20 +) +egamma_lowPt_exclusive.toModify(interestingGedEgammaIsoHCALDetId, + minSCEt = 1.0, #default 20 + minEleEt= 1.0, #default 20 + minPhoEt= 1.0 #default 20 +) diff --git a/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py index d78beddf505fa..c4b569b857f21 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py @@ -36,5 +36,10 @@ gedPhotonSequence = cms.Sequence(gedPhotons) - - +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(gedPhotons, + minSCEtBarrel = 1.0, + minSCEtEndcap = 1.0) +egamma_lowPt_exclusive.toModify(gedPhotonsTmp, + minSCEtBarrel = 1.0, + minSCEtEndcap = 1.0) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py index 9bfef9ac6c9b6..c5c6e2a4e3051 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py @@ -26,3 +26,6 @@ scIslandEndcapProducer = "correctedIslandEndcapSuperClusters", minSCEt = 8.0 ) +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(photonCore,minSCEt=0) # +egamma_lowPt_exclusive.toModify(islandPhotonCore,minSCEt = 1.0) #default 8 diff --git a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py index 7912ab28a8487..2eca73e0bdd52 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py @@ -150,3 +150,8 @@ RecHitFlagToBeExcludedEE = multi5x5BasicClustersCleaned.RecHitFlagToBeExcluded, RecHitSeverityToBeExcludedEE = cleanedHybridSuperClusters.RecHitSeverityToBeExcluded, ) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(photons, + minSCEtBarrel = 1.0, #default 10 + minSCEtEndcap = 1.0) #default 10 diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py index eef751657822c..3e0f16a09a115 100644 --- a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py +++ b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py @@ -97,3 +97,13 @@ def _updateOutput( era, outputPSets, commands): 'keep QIE10DataFrameHcalDataFrameContainer_hcalDigis_ZDC_*' ]) ) + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify( RecoLocalCaloAOD, + outputCommands = RecoLocalCaloAOD.outputCommands + ['keep *_towerMaker_*_*', + 'keep *_zdcreco_*_*', + 'keep ZDCDataFramesSorted_hcalDigis_*_*', + 'keep ZDCDataFramesSorted_castorDigis_*_*', + 'keep QIE10DataFrameHcalDataFrameContainer_hcalDigis_ZDC_*']) + + diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py index 1760b8c5ae452..cebe90bf2f3e7 100644 --- a/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py +++ b/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py @@ -29,3 +29,9 @@ phase2_tracker.toModify(RecoLocalTrackerFEVT, outputCommands = RecoLocalTrackerFEVT.outputCommands + ['keep *_siPhase2Clusters_*_*'] ) phase2_tracker.toModify(RecoLocalTrackerRECO, outputCommands = RecoLocalTrackerRECO.outputCommands + ['keep *_siPhase2Clusters_*_*'] ) +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify( RecoLocalTrackerAOD, + outputCommands = RecoLocalTrackerAOD.outputCommands + ['keep *_siPixelRecHits_*_*', + 'keep *_siPixelClusters_*_*']) + + diff --git a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py index 51e56eba568c9..d46de79b4e901 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py +++ b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py @@ -138,6 +138,15 @@ ) ) +for imp in particleFlowBlock.elementImporters: + if imp.importerName.value() == "SuperClusterImporter": + _scImporter = imp + +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(_scImporter, + minSuperClusterPt = 1.0, + minPTforBypass = 0.0) + def _findIndicesByModule(name): ret = [] for i, pset in enumerate(particleFlowBlock.elementImporters): @@ -145,6 +154,7 @@ def _findIndicesByModule(name): ret.append(i) return ret + from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal # kill tracks in the HGCal _insertGeneralTracksImporter = {} @@ -209,3 +219,4 @@ def _findIndicesByModule(name): particleFlowBlock, elementImporters = _addTimingLayer ) + diff --git a/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py index 4816734d259ad..f4dbe87ee77e4 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py +++ b/RecoParticleFlow/PFProducer/python/particleFlow_cfi.py @@ -231,3 +231,5 @@ electron_protectionsForBadHcal = dict(enableProtections = True), photon_protectionsForBadHcal = dict(enableProtections = True)) +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(particleFlowTmp,photon_MinEt = 1.) diff --git a/RecoParticleFlow/PFTracking/python/pfTrackElec_cfi.py b/RecoParticleFlow/PFTracking/python/pfTrackElec_cfi.py index 01819a3d3b325..0758a3b3949eb 100644 --- a/RecoParticleFlow/PFTracking/python/pfTrackElec_cfi.py +++ b/RecoParticleFlow/PFTracking/python/pfTrackElec_cfi.py @@ -41,5 +41,5 @@ pf_convBremFinderID_mvaWeightFileEndcapsHighPt = cms.FileInPath('RecoParticleFlow/PFTracking/data/TMVAClassification_ConvBremFinder_Testetgt20absetagt1_479_BDT.weights.xml') ) - - +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(pfTrackElec,MinSCEnergy = 1.0) diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index 9c247e9025be9..28e58d27c5084 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -71,3 +71,5 @@ _fastSim_trackerDrivenElectronSeeds.idCollection = cms.VInputTag("trackerDrivenElectronSeedsTmp:preid",) fastSim.toReplaceWith(trackerDrivenElectronSeeds,_fastSim_trackerDrivenElectronSeeds) +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +egamma_lowPt_exclusive.toModify(trackerDrivenElectronSeeds,MinPt = 1.0)