Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Light by light modifier 1100 pre1 #27633

Merged
merged 9 commits into from
Aug 22, 2019
Merged

Light by light modifier 1100 pre1 #27633

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b8c8ad
adding light by light modifier
Sam-Harper Jul 10, 2019
7929e6a
updating rechits and ecal digis selectors
rchudasa Jul 11, 2019
ce82fec
Modifier for lbyl added to Eras repo
rchudasa Jul 15, 2019
bf4ecb0
interesting rechit threshold updated
rchudasa Jul 31, 2019
645b619
ecalDrivenElectronseed merge conflict solved
rchudasa Aug 1, 2019
e7abd48
Light by light modifier renamed to egamma_lowPt_exclusive and repo ch…
rchudasa Aug 5, 2019
287747f
Light by light modifier renamed to egamma_lowPt_exclusive in correspo…
rchudasa Aug 5, 2019
38a560d
Event content code based, island photon threshold not changed and Sla…
rchudasa Aug 12, 2019
fb097ff
removed commented lines in particleFlowBlock
rchudasa Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Configuration/ProcessModifiers/python/egamma_lowPt_exclusive_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

egamma_lowPt_exclusive = cms.Modifier()
5 changes: 5 additions & 0 deletions RecoEcal/EgammaClusterProducers/python/ecalDigiSelector_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
7 changes: 7 additions & 0 deletions RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

4 changes: 4 additions & 0 deletions RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 4 additions & 0 deletions RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 8 additions & 0 deletions RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

8 changes: 8 additions & 0 deletions RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 12 additions & 0 deletions RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
9 changes: 7 additions & 2 deletions RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 3 additions & 0 deletions RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,11 @@
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
egamma_lowPt_exclusive.toModify(islandPhotons,
minSCEtBarrel = 1.0, #default 5
minSCEtEndcap = 1.0) #default 15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not a part of the regular pp reco.
Why is this modified?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, we will not change the island Photon thresholds (updating it in the next commit).

6 changes: 6 additions & 0 deletions RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,9 @@ def _findIndicesByModule(name):
particleFlowBlock,
elementImporters = _addTimingLayer
)

from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive
egamma_lowPt_exclusive.toModify(particleFlowBlock.elementImporters[2],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use _findIndicesByModule instead of direct indexing.
A less preferred solution would be to move this change up, to be right after the definition of particleFlowBlock, before all other modifiers are called

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please suggest how exactly should I do it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

visually, it looks like replacing 2 with _findIndicesByModule("SuperClusterImporter")[0] should work,
perhaps more effective is to do

for imp in particleFlowBlock.elementImporters:
  if imp..importerName.value() == "SuperClusterImporter":
    _scImporter = imp
egamma_lowPt_exclusive.toModify(_scImporter, ...

minSuperClusterPt = 1.0,
minPTforBypass = 0.0)

2 changes: 2 additions & 0 deletions RecoParticleFlow/PFProducer/python/particleFlow_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
4 changes: 2 additions & 2 deletions RecoParticleFlow/PFTracking/python/pfTrackElec_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 2 additions & 0 deletions RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)