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

Jump to bottom

Clean/rename FromMultiCl HGCal egamma collections #34439

Merged
merged 16 commits into from Aug 10, 2021
Merged

Clean/rename FromMultiCl HGCal egamma collections #34439

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d98bec8
First commit.
SohamBhattacharya Jul 8, 2021
89bf773
Minor changes.
SohamBhattacharya Jul 8, 2021
353316e
Minor changes.
SohamBhattacharya Jul 8, 2021
36d3c0b
Minor changes.
SohamBhattacharya Jul 8, 2021
36252d9
Fixed DQM.
SohamBhattacharya Jul 8, 2021
6c9e7d5
Fixed DQM.
SohamBhattacharya Jul 8, 2021
8704205
Fixed RecoTauTag
SohamBhattacharya Jul 8, 2021
c0fd69f
Minor changes.
SohamBhattacharya Jul 8, 2021
cc9bb11
Egamma HGC to contain HGCal electrons/photons only (exclude the barrel).
SohamBhattacharya Jul 8, 2021
ca33df9
Implemented review comments.
SohamBhattacharya Jul 19, 2021
0f17d95
Delete file. Committed unintentionally.
SohamBhattacharya Jul 19, 2021
672b512
Added hgcalOnly flag in RecoEgamma/EgammaPhotonProducers/python/photo…
SohamBhattacharya Jul 24, 2021
f649e65
Implemented review comment: `hgcalOnly` renamed to `endcapOnly` in `R…
SohamBhattacharya Jul 26, 2021
7900f04
Implemented review comments.
SohamBhattacharya Jul 27, 2021
d00db96
Implemented changes related to comment: https://github.com/cms-sw/cms…
SohamBhattacharya Aug 2, 2021
a361668
Implemented review comment: https://github.com/cms-sw/cmssw/pull/3443…
SohamBhattacharya Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DQMOffline/EGamma/python/egammaDQMOffline_cff.py
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
stdPhotonAnalysisHGCal = stdPhotonAnalysis.clone()
stdPhotonAnalysisHGCal.ComponentName = 'stdPhotonAnalyzerHGCalFromMultiCl'
Copy link
Contributor

@srimanob srimanob Aug 2, 2021 •
edited

Choose a reason for hiding this comment

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

Not sure if I understand if you would like to update on phoProducer, while keeping the ComponentName and analyzerName as before, stdPhotonAnalyzerHGCalFromMultiCl.

This comment includes
https://github.com/cms-sw/cmssw/blob/master/DQMOffline/EGamma/python/photonOfflineDQMClient_cff.py#L13

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry for late comment @SohamBhattacharya
I just look through the change in the histogram and have a question.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@srimanob I had left some of the names in the DQM modules unchanged as the DQM updates are to follow soon [1]. However, it's true that it would be good to update the names to be consistent with the new naming convention.
After consulting our DQM/Validation experts (@beaudett and @archiron), I have updated the names in the latest commit.

[1] #34439 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks @SohamBhattacharya

Copy link
Contributor

Choose a reason for hiding this comment

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

It would be better to change this all to be

stdPhotonAnalysisHGCal = stdPhotonAnalysis.clone(
  ComponentName = 'stdPhotonAnalyzerHGCalFromMultiCl',
  analyzerName = 'stdPhotonAnalyzerHGCalFromMultiCl',
  phoProducer = 'photonsHGC',
  isolationStrength = 2,
  etaMin = -3.0,
  etaMax = 3.0,
  maxPhoEta = 3.0
)

stdPhotonAnalysisHGCal.analyzerName = 'stdPhotonAnalyzerHGCalFromMultiCl'
stdPhotonAnalysisHGCal.phoProducer = 'photonsFromMultiCl'
stdPhotonAnalysisHGCal.phoProducer = 'photonsHGC'
stdPhotonAnalysisHGCal.isolationStrength = 2
stdPhotonAnalysisHGCal.etaMin = -3.0
stdPhotonAnalysisHGCal.etaMax = 3.0
Expand Down
12 changes: 6 additions & 6 deletions DQMOffline/EGamma/python/electronAnalyzerSequence_cff.py
View file
Open in desktop
Expand Up @@ -48,22 +48,22 @@
* dqmElectronTagProbeAnalysis
)

mergedSuperClustersFromMultiCl = mergedSuperClusters.clone()
mergedSuperClustersFromMultiCl.src = cms.VInputTag(
mergedSuperClustersHGC = mergedSuperClusters.clone()
mergedSuperClustersHGC.src = cms.VInputTag(
cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"),
cms.InputTag("particleFlowSuperClusterHGCalFromMultiCl","")
cms.InputTag("particleFlowSuperClusterHGCal","")
)
dqmElectronAnalysisAllElectronsFromMultiCl = dqmElectronAnalysisAllElectrons.clone()
dqmElectronAnalysisAllElectronsFromMultiCl.OutputFolderName = 'Egamma/Electrons/Ele2FromMultiCl_All'
dqmElectronAnalysisAllElectronsFromMultiCl.MaxAbsEtaMatchingObject = 3.0
dqmElectronAnalysisAllElectronsFromMultiCl.EtaMax = 3.0
dqmElectronAnalysisAllElectronsFromMultiCl.EtaMin = -3.0
dqmElectronAnalysisAllElectronsFromMultiCl.MaxAbsEta = 3.0
dqmElectronAnalysisAllElectronsFromMultiCl.ElectronCollection = 'ecalDrivenGsfElectronsFromMultiCl'
dqmElectronAnalysisAllElectronsFromMultiCl.MatchingObjectCollection = 'mergedSuperClustersFromMultiCl'
dqmElectronAnalysisAllElectronsFromMultiCl.ElectronCollection = 'ecalDrivenGsfElectronsHGC'
dqmElectronAnalysisAllElectronsFromMultiCl.MatchingObjectCollection = 'mergedSuperClustersHGC'

_electronAnalyzerSequenceFromMultiCl = electronAnalyzerSequence.copy()
_electronAnalyzerSequenceFromMultiCl += cms.Sequence(mergedSuperClustersFromMultiCl+dqmElectronAnalysisAllElectronsFromMultiCl)
_electronAnalyzerSequenceFromMultiCl += cms.Sequence(mergedSuperClustersHGC+dqmElectronAnalysisAllElectronsFromMultiCl)

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify( mergedSuperClusters, src = cms.VInputTag( cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"), cms.InputTag("particleFlowSuperClusterHGCal","") ) )
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
View file
Open in desktop
Expand Up @@ -186,7 +186,7 @@
cms.untracked.PSet(branch = cms.untracked.string("EcalRecHitsSorted_reducedEgamma_reducedESRecHits_*"),splitLevel=cms.untracked.int32(99)),
])

_phase2_hgc_extraCommands = ["keep *_slimmedElectronsFromMultiCl_*_*", "keep *_slimmedPhotonsFromMultiCl_*_*"]
_phase2_hgc_extraCommands = ["keep *_slimmedElectronsHGC_*_*", "keep *_slimmedPhotonsHGC_*_*"]
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify(MicroEventContentMC, outputCommands = MicroEventContentMC.outputCommands + _phase2_hgc_extraCommands)

Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
View file
Open in desktop
Expand Up @@ -534,8 +534,8 @@ def _add_deepMET(process):
# EGamma objects from HGCal are not yet in GED
# so add companion collections for Phase-II MiniAOD production
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
process.load("RecoEgamma.EgammaTools.slimmedEgammaFromMultiCl_cff")
phase2_hgcal.toModify(task, func=lambda t: t.add(process.slimmedEgammaFromMultiClTask))
process.load("RecoEgamma.EgammaTools.slimmedEgammaHGC_cff")
phase2_hgcal.toModify(task, func=lambda t: t.add(process.slimmedEgammaHGCTask))

# L1 pre-firing weights for 2016, 2017, and 2018
from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring
Expand Down
7 changes: 2 additions & 5 deletions RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -26,9 +26,7 @@
'keep recoCaloClusters_particleFlowSuperClusterOOTECAL_*_*')
)
_phase2_hgcal_scCommandsAOD = ['keep recoSuperClusters_particleFlowSuperClusterHGCal__*',
'keep recoCaloClusters_particleFlowSuperClusterHGCal__*',
'keep recoSuperClusters_particleFlowSuperClusterHGCalFromMultiCl__*',
'keep recoCaloClusters_particleFlowSuperClusterHGCalFromMultiCl__*']
'keep recoCaloClusters_particleFlowSuperClusterHGCal__*']

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify(RecoEcalAOD,
Expand Down Expand Up @@ -65,8 +63,7 @@
'drop recoSuperClusters_multi5x5SuperClusters_multi5x5BarrelSuperClusters_*')
)
RecoEcalRECO.outputCommands.extend(RecoEcalAOD.outputCommands)
_phase2_hgcal_scCommands = ['keep *_particleFlowSuperClusterHGCal_*_*',
'keep *_particleFlowSuperClusterHGCalFromMultiCl_*_*']
_phase2_hgcal_scCommands = ['keep *_particleFlowSuperClusterHGCal_*_*']
phase2_hgcal.toModify(RecoEcalRECO,
outputCommands = RecoEcalRECO.outputCommands + _phase2_hgcal_scCommands)

Expand Down
11 changes: 2 additions & 9 deletions RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
phase2_hgcal.toModify(
particleFlowSuperClusterHGCal,
PFClusters = 'particleFlowClusterHGCal',
useRegression = False, #no HGCal regression yet
useRegression = True,
use_preshower = False,
PFBasicClusterCollectionEndcap = "",
PFSuperClusterCollectionEndcap = "",
Expand All @@ -25,13 +25,7 @@
dropUnseedable = True,
)

particleFlowSuperClusterHGCalFromMultiCl = particleFlowSuperClusterHGCal.clone()
phase2_hgcal.toModify(
particleFlowSuperClusterHGCalFromMultiCl,
PFClusters = 'particleFlowClusterHGCalFromMultiCl',
useRegression = True,
)
phase2_hgcal.toModify( particleFlowSuperClusterHGCalFromMultiCl.regressionConfig,
phase2_hgcal.toModify( particleFlowSuperClusterHGCal.regressionConfig,
regressionKeyEE = "superclus_hgcal_mean_offline",
uncertaintyKeyEE = "superclus_hgcal_sigma_offline",
isPhaseII = True,
Expand All @@ -40,7 +34,6 @@
)
_phase2_hgcal_particleFlowSuperClusteringTask = particleFlowSuperClusteringTask.copy()
_phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCal)
_phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCalFromMultiCl)

phase2_hgcal.toReplaceWith( particleFlowSuperClusteringTask, _phase2_hgcal_particleFlowSuperClusteringTask )

8 changes: 4 additions & 4 deletions RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -52,10 +52,10 @@
# mods for HGCAL
_phase2_hgcal_RecoEgamma_tokeep = [ 'keep *_ecalDrivenGsfElectronCores_*_*',
'keep *_ecalDrivenGsfElectrons_*_*',
'keep *_ecalDrivenGsfElectronCoresFromMultiCl_*_*',
'keep *_ecalDrivenGsfElectronsFromMultiCl_*_*',
'keep *_photonCoreFromMultiCl_*_*',
'keep *_photonsFromMultiCl_*_*']
'keep *_ecalDrivenGsfElectronCoresHGC_*_*',
'keep *_ecalDrivenGsfElectronsHGC_*_*',
'keep *_photonCoreHGC_*_*',
'keep *_photonsHGC_*_*']

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify( RecoEgammaAOD,
Expand Down
9 changes: 8 additions & 1 deletion RecoEgamma/EgammaElectronProducers/plugins/GsfElectronCoreEcalDrivenProducer.cc
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ class GsfElectronCoreEcalDrivenProducer : public edm::global::EDProducer<> {

private:
const bool useGsfPfRecTracks_;
const bool hgcalOnly_;

const edm::EDGetTokenT<reco::GsfPFRecTrackCollection> gsfPfRecTracksToken_;
const edm::EDGetTokenT<reco::GsfTrackCollection> gsfTracksToken_;
Expand All @@ -41,11 +42,13 @@ void GsfElectronCoreEcalDrivenProducer::fillDescriptions(edm::ConfigurationDescr
desc.add<edm::InputTag>("gsfTracks", {"electronGsfTracks"});
desc.add<edm::InputTag>("ctfTracks", {"generalTracks"});
desc.add<bool>("useGsfPfRecTracks", true);
desc.add<bool>("hgcalOnly", false);
descriptions.add("ecalDrivenGsfElectronCores", desc);
}

GsfElectronCoreEcalDrivenProducer::GsfElectronCoreEcalDrivenProducer(const edm::ParameterSet& config)
: useGsfPfRecTracks_(config.getParameter<bool>("useGsfPfRecTracks")),
hgcalOnly_(config.getParameter<bool>("hgcalOnly")),
gsfPfRecTracksToken_(mayConsume<GsfPFRecTrackCollection>(config.getParameter<edm::InputTag>("gsfPfRecTracks"))),
gsfTracksToken_(consumes<reco::GsfTrackCollection>(config.getParameter<edm::InputTag>("gsfTracks"))),
ctfTracksToken_(consumes<reco::TrackCollection>(config.getParameter<edm::InputTag>("ctfTracks"))),
Expand Down Expand Up @@ -74,7 +77,11 @@ void GsfElectronCoreEcalDrivenProducer::produce(edm::StreamID, edm::Event& event

auto scRef = gsfTrackRef->extra()->seedRef().castTo<ElectronSeedRef>()->caloCluster().castTo<SuperClusterRef>();
if (!scRef.isNull()) {
eleCore.setSuperCluster(scRef);
// if hgcalOnly flag is true but this seed is not from HGCAL, skip it.
if (hgcalOnly_ && !scRef->seed()->caloID().detector(reco::CaloID::DET_HGCAL_ENDCAP))
electrons.pop_back();
else
eleCore.setSuperCluster(scRef);
} else {
electrons.pop_back();
edm::LogWarning("GsfElectronCoreEcalDrivenProducer") << "Seed CaloCluster is not a SuperCluster, unexpected...";
Expand Down
3 changes: 0 additions & 3 deletions RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py
View file
Open in desktop
Expand Up @@ -25,6 +25,3 @@
LowPtThreshold =1.0,
applyHOverECut = False)

# create ecal driven seeds for electron using HGCal Multiclusters
ecalDrivenElectronSeedsFromMultiCl = ecalDrivenElectronSeeds.clone(
endcapSuperClusters = 'particleFlowSuperClusterHGCalFromMultiCl')
6 changes: 0 additions & 6 deletions RecoEgamma/EgammaElectronProducers/python/ecalDrivenGsfElectronCoresFromMultiCl_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions RecoEgamma/EgammaElectronProducers/python/ecalDrivenGsfElectronCoresHGC_cff.py
View file
Open in desktop
@@ -0,0 +1,7 @@
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores

ecalDrivenGsfElectronCoresHGC = ecalDrivenGsfElectronCores.clone(
gsfTracks = 'electronGsfTracks',
useGsfPfRecTracks = False,
hgcalOnly = True,
)
8 changes: 4 additions & 4 deletions RecoEgamma/EgammaElectronProducers/python/gsfElectronSequence_cff.py
View file
Open in desktop
Expand Up @@ -7,16 +7,16 @@
#==============================================================================

from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresFromMultiCl_cff import ecalDrivenGsfElectronCoresFromMultiCl
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresHGC_cff import ecalDrivenGsfElectronCoresHGC
from RecoEgamma.EgammaElectronProducers.gsfElectrons_cfi import *

gsfEcalDrivenElectronTask = cms.Task(ecalDrivenGsfElectronCores,ecalDrivenGsfElectrons)
gsfEcalDrivenElectronSequence = cms.Sequence(gsfEcalDrivenElectronTask)

_gsfEcalDrivenElectronTaskFromMultiCl = gsfEcalDrivenElectronTask.copy()
_gsfEcalDrivenElectronTaskFromMultiCl.add(cms.Task(ecalDrivenGsfElectronCoresFromMultiCl,ecalDrivenGsfElectronsFromMultiCl))
_gsfEcalDrivenElectronTaskHGC = gsfEcalDrivenElectronTask.copy()
_gsfEcalDrivenElectronTaskHGC.add(cms.Task(ecalDrivenGsfElectronCoresHGC,ecalDrivenGsfElectronsHGC))

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toReplaceWith(
gsfEcalDrivenElectronTask, _gsfEcalDrivenElectronTaskFromMultiCl
gsfEcalDrivenElectronTask, _gsfEcalDrivenElectronTaskHGC
)
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtBarrel = 15.0)
pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtEndcaps = 15.0)

ecalDrivenGsfElectronsFromMultiCl = ecalDrivenGsfElectrons.clone(
gsfElectronCoresTag = "ecalDrivenGsfElectronCoresFromMultiCl",
ecalDrivenGsfElectronsHGC = ecalDrivenGsfElectrons.clone(
gsfElectronCoresTag = "ecalDrivenGsfElectronCoresHGC",
useGsfPfRecTracks = False,
useDefaultEnergyCorrection = False,
ambClustersOverlapStrategy = 0,
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronProducers/python/uncleanedOnlyElectronSequence_cff.py
View file
Open in desktop
Expand Up @@ -135,7 +135,7 @@
#

from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresFromMultiCl_cff import ecalDrivenGsfElectronCoresFromMultiCl
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresHGC_cff import ecalDrivenGsfElectronCoresHGC
uncleanedOnlyGsfElectronCores = ecalDrivenGsfElectronCores.clone(
gsfTracks = "uncleanedOnlyElectronGsfTracks",
gsfPfRecTracks = "uncleanedOnlyPfTrackElec"
Expand Down
9 changes: 6 additions & 3 deletions RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py
View file
Open in desktop
Expand Up @@ -13,12 +13,15 @@
pixelSeedProducer = cms.InputTag('electronMergedSeeds'),
minSCEt = cms.double(10.0),
risolveConversionAmbiguity = cms.bool(True),
endcapOnly = cms.bool(False),
# MVA_weights_location = cms.string('RecoEgamma/EgammaTools/data/TMVAnalysis_Likelihood.weights.txt')
)

photonCoreFromMultiCl = photonCore.clone(
scIslandEndcapProducer = 'particleFlowSuperClusterHGCalFromMultiCl',
pixelSeedProducer = 'electronMergedSeedsFromMultiCl'
photonCoreHGC = photonCore.clone(
Copy link
Contributor

Choose a reason for hiding this comment

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

logs now show

%MSG-e PhotonCoreProducer:  PhotonCoreProducer:photonCoreHGC  20-Jul-2021 10:58:48 CEST Run: 1 Event: 2
Error! Can't get the scHybridBarrelProducer

is there a configuration flag to silence it?

scHybridBarrelProducer = "",
scIslandEndcapProducer = 'particleFlowSuperClusterHGCal',
pixelSeedProducer = 'electronMergedSeeds',
endcapOnly = True,
)

islandPhotonCore = photonCore.clone(
Expand Down
6 changes: 3 additions & 3 deletions RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py
View file
Open in desktop
Expand Up @@ -10,15 +10,15 @@
photonTask = cms.Task(photonCore,photons)
photonSequence = cms.Sequence(photonTask)

_photonTaskFromMultiCl = photonTask.copy()
_photonTaskFromMultiCl.add(photonCoreFromMultiCl,photonsFromMultiCl)
_photonTaskHGC = photonTask.copy()
_photonTaskHGC.add(photonCoreHGC,photonsHGC)
_photonTaskWithIsland = photonTask.copy()
_photonTaskWithIsland.add(islandPhotonCore,islandPhotons)


from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toReplaceWith(
photonTask, _photonTaskFromMultiCl
photonTask, _photonTaskHGC
)

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
Expand Down
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py
View file
Open in desktop
Expand Up @@ -83,8 +83,8 @@
checkHcalStatus = cms.bool(True),
)

photonsFromMultiCl = photons.clone(
photonProducer = 'photonCoreFromMultiCl'
photonsHGC = photons.clone(
photonProducer = 'photonCoreHGC'
)

islandPhotons = cms.EDProducer("PhotonProducer",
Expand Down
8 changes: 7 additions & 1 deletion RecoEgamma/EgammaPhotonProducers/src/PhotonCoreProducer.cc
View file
Open in desktop
Expand Up @@ -55,6 +55,7 @@ class PhotonCoreProducer : public edm::stream::EDProducer<> {
edm::ParameterSet conf_;
bool validPixelSeeds_;
bool risolveAmbiguity_;
bool endcapOnly_;
};

#include "FWCore/Framework/interface/MakerMacros.h"
Expand All @@ -74,6 +75,7 @@ PhotonCoreProducer::PhotonCoreProducer(const edm::ParameterSet& config)
pixelSeedProducer_ = consumes<reco::ElectronSeedCollection>(conf_.getParameter<edm::InputTag>("pixelSeedProducer"));
minSCEt_ = conf_.getParameter<double>("minSCEt");
risolveAmbiguity_ = conf_.getParameter<bool>("risolveConversionAmbiguity");
endcapOnly_ = conf_.getParameter<bool>("endcapOnly");

// Register the product
produces<reco::PhotonCoreCollection>(PhotonCoreCollection_);
Expand All @@ -90,9 +92,13 @@ void PhotonCoreProducer::produce(edm::Event& theEvent, const edm::EventSetup& th

// Get the Barrel Super Cluster collection
bool validBarrelSCHandle = true;
if (endcapOnly_) {
validBarrelSCHandle = false;
}

Handle<reco::SuperClusterCollection> scBarrelHandle;
theEvent.getByToken(scHybridBarrelProducer_, scBarrelHandle);
if (!scBarrelHandle.isValid()) {
if (!endcapOnly_ && !scBarrelHandle.isValid()) {
edm::LogError("PhotonCoreProducer") << "Error! Can't get the scHybridBarrelProducer";
validBarrelSCHandle = false;
}
Expand Down
6 changes: 3 additions & 3 deletions RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc
View file
Open in desktop
Expand Up @@ -113,12 +113,12 @@ void HGCalElectronFilter::endStream() {}

// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
void HGCalElectronFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
// cleanedEcalDrivenGsfElectronsFromMultiCl
// cleanedEcalDrivenGsfElectronsHGC
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("inputGsfElectrons", edm::InputTag("ecalDrivenGsfElectronsFromMultiCl"));
desc.add<edm::InputTag>("inputGsfElectrons", edm::InputTag("ecalDrivenGsfElectronsHGC"));
desc.add<bool>("cleanBarrel", false);
desc.add<std::string>("outputCollection", "");
descriptions.add("cleanedEcalDrivenGsfElectronsFromMultiCl", desc);
descriptions.add("cleanedEcalDrivenGsfElectronsHGC", desc);
}

//define this as a plug-in
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc
View file
Open in desktop
Expand Up @@ -220,7 +220,7 @@ void HGCalElectronIDValueMapProducer::endStream() {}
void HGCalElectronIDValueMapProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
// Auto-generate hgcalElectronIDValueMap_cfi
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("electrons", edm::InputTag("ecalDrivenGsfElectronsFromMultiCl"));
desc.add<edm::InputTag>("electrons", edm::InputTag("ecalDrivenGsfElectronsHGC"));
desc.add<double>("pcaRadius", 3.0);
desc.add<std::vector<std::string>>("variables", valuesProduced_);
desc.add<std::vector<double>>("dEdXWeights")
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc
View file
Open in desktop
Expand Up @@ -204,7 +204,7 @@ void HGCalPhotonIDValueMapProducer::endStream() {}
void HGCalPhotonIDValueMapProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
// hgcalPhotonIDValueMap
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("photons", edm::InputTag("photonsFromMultiCl"));
desc.add<edm::InputTag>("photons", edm::InputTag("photonsHGC"));
desc.add<double>("pcaRadius", 3.0);
desc.add<std::vector<std::string>>("variables", valuesProduced_);
desc.add<std::vector<double>>("dEdXWeights")
Expand Down