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

drop type specs in RecoHI {HiEgammaAlgos,HiJetAlgos,HiMuonAlgos} #32031

Merged
merged 3 commits into from
Nov 6, 2020
Merged

drop type specs in RecoHI {HiEgammaAlgos,HiJetAlgos,HiMuonAlgos} #32031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e1298a
drop type specs in RecoHI {HiEgammaAlgos,HiJetAlgos,HiMuonAlgos}
jeongeun Nov 5, 2020
b106a87
drop type specs
jeongeun Nov 5, 2020
3a46e5e
use origianl implicit value of radiusPU in kPu7CaloJet
jeongeun Nov 6, 2020
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
22 changes: 11 additions & 11 deletions RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
from RecoEgamma.EgammaPhotonProducers.photonSequence_cff import *

# use island for the moment
photonCore.scHybridBarrelProducer = cms.InputTag("correctedIslandBarrelSuperClusters")
photonCore.scIslandEndcapProducer = cms.InputTag("correctedIslandEndcapSuperClusters")
photonCore.minSCEt = cms.double(8.0)
photons.minSCEtBarrel = cms.double(5.0)
photons.minSCEtEndcap = cms.double(15.0)
photons.minR9Barrel = cms.double(10.) #0.94
photons.minR9Endcap = cms.double(10.) #0.95
photons.maxHoverEEndcap = cms.double(0.5) #0.5
photons.maxHoverEBarrel = cms.double(0.99) #0.5
photons.primaryVertexProducer = cms.InputTag('hiSelectedVertex') # replace the primary vertex
photonCore.scHybridBarrelProducer = "correctedIslandBarrelSuperClusters"
photonCore.scIslandEndcapProducer = "correctedIslandEndcapSuperClusters"
photonCore.minSCEt = 8.0
photons.minSCEtBarrel = 5.0
photons.minSCEtEndcap = 15.0
photons.minR9Barrel = 10. #0.94
photons.minR9Endcap = 10. #0.95
photons.maxHoverEEndcap = 0.5 #0.5
photons.maxHoverEBarrel = 0.99 #0.5
photons.primaryVertexProducer = 'hiSelectedVertex' # replace the primary vertex
photons.isolationSumsCalculatorSet.trackProducer = isolationInputParameters.track # cms.InputTag("highPurityTracks")

from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
Expand All @@ -45,7 +45,7 @@
import RecoHI.HiEgammaAlgos.hiSpikeCleaner_cfi
hiSpikeCleanedSC = RecoHI.HiEgammaAlgos.hiSpikeCleaner_cfi.hiSpikeCleaner.clone()
cleanPhotonCore = photonCore.clone(
scHybridBarrelProducer = cms.InputTag("hiSpikeCleanedSC")
scHybridBarrelProducer = "hiSpikeCleanedSC"
)
cleanPhotons = photons.clone(
photonCoreProducer = cms.InputTag("cleanPhotonCore")
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiEgammaAlgos/python/photonIsolationHIProducer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
)

photonIsolationHIProducerpp = photonIsolationHIProducer.clone(
trackCollection = cms.InputTag("generalTracks")
trackCollection = "generalTracks"
)

photonIsolationHIProducerppGED = photonIsolationHIProducerpp.clone(
photonProducer=cms.InputTag("gedPhotons")
photonProducer = "gedPhotons"
)

photonIsolationHIProducerppIsland = photonIsolationHIProducerpp.clone(
photonProducer=cms.InputTag("islandPhotons")
photonProducer = "islandPhotons"
)

from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import *
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiJetAlgos/python/HiGenCleaner_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

from PhysicsTools.JetMCAlgos.SelectPartons_cff import myPartons
genPartons = myPartons.clone(
src = cms.InputTag("hiGenParticles")
)
src = "hiGenParticles"
)

hiPartons = cms.EDProducer('HiPartonCleaner',
src = cms.InputTag('genPartons'),
Expand Down
12 changes: 6 additions & 6 deletions RecoHI/HiJetAlgos/python/HiGenJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
rParam = cms.double(0.5)
)

iterativeCone5HiGenJets.doAreaFastjet = cms.bool(True)
iterativeCone5HiGenJets.doRhoFastjet = cms.bool(False)
iterativeCone5HiGenJets.doAreaFastjet = True
iterativeCone5HiGenJets.doRhoFastjet = False

iterativeCone7HiGenJets = iterativeCone5HiGenJets.clone(rParam=0.7)

Expand All @@ -23,8 +23,8 @@
rParam = cms.double(0.5)
)

ak5HiGenJets.doAreaFastjet = cms.bool(True)
ak5HiGenJets.doRhoFastjet = cms.bool(False)
ak5HiGenJets.doAreaFastjet = True
ak5HiGenJets.doRhoFastjet = False

ak1HiGenJets = ak5HiGenJets.clone(rParam = 0.1)
ak2HiGenJets = ak5HiGenJets.clone(rParam = 0.2)
Expand All @@ -40,8 +40,8 @@
rParam = cms.double(0.4)
)

kt4HiGenJets.doAreaFastjet = cms.bool(True)
kt4HiGenJets.doRhoFastjet = cms.bool(False)
kt4HiGenJets.doAreaFastjet = True
kt4HiGenJets.doRhoFastjet = False

kt6HiGenJets = kt4HiGenJets.clone(rParam=0.6)

Expand Down
11 changes: 5 additions & 6 deletions RecoHI/HiJetAlgos/python/HiPFJetParameters_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
import RecoJets.JetProducers.PFJetParameters_cfi
HiPFJetDefaults = RecoJets.JetProducers.PFJetParameters_cfi.PFJetParameters.clone(
doPUOffsetCorr = False,
doAreaFastjet = True,
doRhoFastjet = True,
doAreaFastjet = True,
doRhoFastjet = True,
doPVCorrection = False,
jetPtMin = 10,
Ghost_EtaMax = 6.5,
# this parameter is missing from PFJetParameters for some reason
Rho_EtaMax = cms.double(4.5)
jetPtMin = 10,
Ghost_EtaMax = 6.5,
Rho_EtaMax = 4.5
)

## add non-uniform fastjet settings
Expand Down
38 changes: 14 additions & 24 deletions RecoHI/HiJetAlgos/python/HiRecoJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,14 @@
rParam = cms.double(0.5)
)
akPu5CaloJets.radiusPU = 0.5
akPu5CaloJets.puPtMin = 10

akPu7CaloJets = cms.EDProducer(
"FastjetJetProducer",
HiCaloJetParameters,
AnomalousCellParameters,
MultipleAlgoIteratorBlock,
jetAlgorithm = cms.string("AntiKt"),
rParam = cms.double(0.7)
)
akPu7CaloJets.radiusPU = 0.7


akPu5CaloJets.puPtMin = cms.double(10)
akPu1CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.1), puPtMin = 4)
akPu2CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.2), puPtMin = 4)
akPu3CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.3), puPtMin = 6)
akPu4CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.4), puPtMin = 8)
akPu6CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.6), puPtMin = 12)
akPu7CaloJets = akPu5CaloJets.clone(rParam = cms.double(0.7), puPtMin = 14)
akPu1CaloJets = akPu5CaloJets.clone(rParam = 0.1, puPtMin = 4)
akPu2CaloJets = akPu5CaloJets.clone(rParam = 0.2, puPtMin = 4)
akPu3CaloJets = akPu5CaloJets.clone(rParam = 0.3, puPtMin = 6)
akPu4CaloJets = akPu5CaloJets.clone(rParam = 0.4, puPtMin = 8)
akPu6CaloJets = akPu5CaloJets.clone(rParam = 0.6, puPtMin = 12)
akPu7CaloJets = akPu5CaloJets.clone(rParam = 0.7, puPtMin = 14)

ak5CaloJets = cms.EDProducer(
"FastjetJetProducer",
Expand All @@ -94,12 +83,13 @@
rParam = cms.double(0.5)
)
ak5CaloJets.doPUOffsetCorr = False
ak1CaloJets = ak5CaloJets.clone(rParam = cms.double(0.1))
ak2CaloJets = ak5CaloJets.clone(rParam = cms.double(0.2))
ak3CaloJets = ak5CaloJets.clone(rParam = cms.double(0.3))
ak4CaloJets = ak5CaloJets.clone(rParam = cms.double(0.4))
ak6CaloJets = ak5CaloJets.clone(rParam = cms.double(0.6))
ak7CaloJets = ak5CaloJets.clone(rParam = cms.double(0.7))

ak1CaloJets = ak5CaloJets.clone(rParam = 0.1)
ak2CaloJets = ak5CaloJets.clone(rParam = 0.2)
ak3CaloJets = ak5CaloJets.clone(rParam = 0.3)
ak4CaloJets = ak5CaloJets.clone(rParam = 0.4)
ak6CaloJets = ak5CaloJets.clone(rParam = 0.6)
ak7CaloJets = ak5CaloJets.clone(rParam = 0.7)


## Default Sequence
Expand Down
63 changes: 30 additions & 33 deletions RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
pfEmptyCollection = cms.EDFilter('GenericPFCandidateSelector',
src = cms.InputTag('particleFlow'),
cut = cms.string("pt<0")
)
)

ak5PFJets = cms.EDProducer(
"FastjetJetProducer",
Expand All @@ -21,27 +21,25 @@
MultipleAlgoIteratorBlock,
jetAlgorithm = cms.string("AntiKt"),
rParam = cms.double(0.5)
)
ak5PFJets.src = cms.InputTag('particleFlow')
)
ak5PFJets.src = 'particleFlow'

akPu5PFJets = ak5PFJets.clone(
jetType = cms.string('BasicJet'),
jetType = 'BasicJet',
doPVCorrection = False,
doPUOffsetCorr = True,
subtractorName = cms.string("MultipleAlgoIterator"),
src = cms.InputTag('PFTowers'),
doAreaFastjet = False
)


subtractorName = "MultipleAlgoIterator",
src = 'PFTowers',
doAreaFastjet = False,
puPtMin = cms.double(25)
Copy link
Contributor

Choose a reason for hiding this comment

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

drop type spec

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@perrotta I got TypeError when I drop it. TypeError: puPtMin does not already exist, so it can only be set to a CMS python configuration type

)

akPu5PFJets.puPtMin = cms.double(25)
akPu1PFJets = akPu5PFJets.clone(rParam = cms.double(0.1), puPtMin = 10)
akPu2PFJets = akPu5PFJets.clone(rParam = cms.double(0.2), puPtMin = 10)
akPu3PFJets = akPu5PFJets.clone(rParam = cms.double(0.3), puPtMin = 15)
akPu4PFJets = akPu5PFJets.clone(rParam = cms.double(0.4), puPtMin = 20)
akPu6PFJets = akPu5PFJets.clone(rParam = cms.double(0.6), puPtMin = 30)
akPu7PFJets = akPu5PFJets.clone(rParam = cms.double(0.7), puPtMin = 35)
akPu1PFJets = akPu5PFJets.clone(rParam = 0.1, puPtMin = 10)
akPu2PFJets = akPu5PFJets.clone(rParam = 0.2, puPtMin = 10)
akPu3PFJets = akPu5PFJets.clone(rParam = 0.3, puPtMin = 15)
akPu4PFJets = akPu5PFJets.clone(rParam = 0.4, puPtMin = 20)
akPu6PFJets = akPu5PFJets.clone(rParam = 0.6, puPtMin = 30)
akPu7PFJets = akPu5PFJets.clone(rParam = 0.7, puPtMin = 35)

hiPFCandCleanerforJets = cms.EDFilter('GenericPFCandidateSelector',
src = cms.InputTag('particleFlow'),
Expand All @@ -50,13 +48,13 @@

ak4PFJetsForFlow = akPu5PFJets.clone(
Ghost_EtaMax = 5.0,
Rho_EtaMax = 4.4,
Rho_EtaMax = 4.4,
doRhoFastjet = False,
jetPtMin = 15.0,
nSigmaPU = cms.double(1.0),
rParam = 0.4,
radiusPU = cms.double(0.5),
src = "hiPFCandCleanerforJets",
jetPtMin = 15.0,
nSigmaPU = 1.0,
rParam = 0.4,
radiusPU = 0.5,
src = "hiPFCandCleanerforJets",
)

kt4PFJetsForRho = cms.EDProducer(
Expand All @@ -66,11 +64,10 @@
jetAlgorithm = cms.string("Kt"),
rParam = cms.double(0.4)
)

kt4PFJetsForRho.src = cms.InputTag('particleFlow')
kt4PFJetsForRho.doAreaFastjet = cms.bool(True)
kt4PFJetsForRho.jetPtMin = cms.double(0.0)
kt4PFJetsForRho.GhostArea = cms.double(0.005)
kt4PFJetsForRho.src = 'particleFlow'
kt4PFJetsForRho.doAreaFastjet = True
kt4PFJetsForRho.jetPtMin = 0.0
kt4PFJetsForRho.GhostArea = 0.005

from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer

Expand All @@ -96,13 +93,13 @@
rhoFlowFitParams = cms.InputTag('hiFJRhoFlowModulation', 'rhoFlowFitParams'),
jetCollInstanceName = cms.string("pfParticlesCs"),
)
akCs4PFJets.src = cms.InputTag('particleFlow')
akCs4PFJets.doAreaFastjet = cms.bool(True)
akCs4PFJets.jetPtMin = cms.double(0.0)
akCs4PFJets.src = 'particleFlow'
akCs4PFJets.doAreaFastjet = True
akCs4PFJets.jetPtMin = 0.0
akCs4PFJets.useExplicitGhosts = cms.bool(True)
Copy link
Contributor

Choose a reason for hiding this comment

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

have you tried akCs4PFJets.useExplicitGhosts = True?

Copy link
Contributor

Choose a reason for hiding this comment

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

have you tried akCs4PFJets.useExplicitGhosts = True?

The useExplicitGhosts parameter is missing in the akCs4PFJets config, contrarily to the other ones there which can therefore get modified without defining the type

akCs4PFJets.GhostArea = cms.double(0.005)
akCs4PFJets.GhostArea = 0.005

akCs3PFJets = akCs4PFJets.clone(rParam = cms.double(0.3))
akCs3PFJets = akCs4PFJets.clone(rParam = 0.3)

hiRecoPFJetsTask = cms.Task(
PFTowers,
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiJetAlgos/python/hiCaloJetsForTrk_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
from JetMETCorrections.Configuration.DefaultJEC_cff import *


hiCaloTowerForTrk = calotowermaker.clone(hbheInput=cms.InputTag('hbheprereco'))
akPu4CaloJetsForTrk = akPu4CaloJets.clone( srcPVs = cms.InputTag('hiSelectedPixelVertex'), src= cms.InputTag('hiCaloTowerForTrk'))
hiCaloTowerForTrk = calotowermaker.clone( hbheInput = 'hbheprereco')
akPu4CaloJetsForTrk = akPu4CaloJets.clone( srcPVs = 'hiSelectedPixelVertex', src = 'hiCaloTowerForTrk')

akPu4CaloJetsCorrected = ak4CaloJetsL2L3.clone(
src = cms.InputTag("akPu4CaloJetsForTrk")
src = "akPu4CaloJetsForTrk"
)

akPu4CaloJetsSelected = cms.EDFilter( "LargestEtCaloJetSelector",
Expand Down
2 changes: 1 addition & 1 deletion RecoHI/HiJetAlgos/python/hiFJRhoProducer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
)

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
pA_2016.toModify(hiFJRhoProducer, etaRanges = cms.vdouble(-5., -3., -2., -1.5, -1., 1., 1.5, 2., 3., 5.))
pA_2016.toModify(hiFJRhoProducer, etaRanges = [-5., -3., -2., -1.5, -1., 1., 1.5, 2., 3., 5.])
50 changes: 26 additions & 24 deletions RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
hiTracks = 'hiGeneralTracks' #heavy ion track label

# replace with heavy ion track label
hiMuons1stStep = muons1stStep.clone()
hiMuons1stStep.inputCollectionLabels = [hiTracks, 'globalMuons', 'standAloneMuons:UpdatedAtVtx','tevMuons:firstHit','tevMuons:picky','tevMuons:dyt']
hiMuons1stStep.inputCollectionTypes = ['inner tracks', 'links', 'outer tracks','tev firstHit', 'tev picky', 'tev dyt']
hiMuons1stStep.TrackExtractorPSet.inputTrackCollection = hiTracks
hiMuons1stStep.minPt = cms.double(0.8)
#iso deposits are not used in HI
hiMuons1stStep.writeIsoDeposits = False
#hiMuons1stStep.fillGlobalTrackRefits = False
muonEcalDetIds.inputCollection = "hiMuons1stStep"
hiMuons1stStep = muons1stStep.clone(
inputCollectionLabels = [hiTracks, 'globalMuons', 'standAloneMuons:UpdatedAtVtx','tevMuons:firstHit','tevMuons:picky','tevMuons:dyt'],
inputCollectionTypes = ['inner tracks', 'links', 'outer tracks','tev firstHit', 'tev picky', 'tev dyt'],
TrackExtractorPSet = dict(inputTrackCollection = hiTracks),
minPt = 0.8,
#iso deposits are not used in HI
writeIsoDeposits = False,
#fillGlobalTrackRefits = False
)

muIsoDepositTk.inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:tracker"))
muIsoDepositJets. inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:jets"))
muIsoDepositCalByAssociatorTowers.inputTags = cms.VInputTag(cms.InputTag("hiMuons1stStep:ecal"), cms.InputTag("hiMuons1stStep:hcal"), cms.InputTag("hiMuons1stStep:ho"))

muonShowerInformation.muonCollection = "hiMuons1stStep"
muonEcalDetIds.inputCollection = "hiMuons1stStep"
muIsoDepositTk.inputTags = ["hiMuons1stStep:tracker"]
muIsoDepositJets.inputTags = ["hiMuons1stStep:jets"]
muIsoDepositCalByAssociatorTowers.inputTags = ["hiMuons1stStep:ecal", "hiMuons1stStep:hcal", "hiMuons1stStep:ho"]
muonShowerInformation.muonCollection = "hiMuons1stStep"

#don't modify somebody else's sequence, create a new one if needed
#standalone muon tracking is already done... so remove standalonemuontracking from muontracking
Expand All @@ -38,21 +38,23 @@
globalMuons.TrackerCollectionLabel = hiTracks

# replace with heavy ion jet label
hiMuons1stStep.JetExtractorPSet.JetCollectionLabel = cms.InputTag("iterativeConePu5CaloJets")
hiMuons1stStep.JetExtractorPSet.JetCollectionLabel = "iterativeConePu5CaloJets"

# turn off calo muons for timing considerations
hiMuons1stStep.minPCaloMuon = cms.double( 1.0E9 )
hiMuons1stStep.minPCaloMuon = 1.0E9

# high level reco
from RecoMuon.MuonIdentification.muons_cfi import muons
muons.InputMuons = cms.InputTag("hiMuons1stStep")
muons.PFCandidates = cms.InputTag("particleFlowTmp")
muons.FillDetectorBasedIsolation = cms.bool(False)
muons.FillPFIsolation = cms.bool(False)
muons.FillSelectorMaps = cms.bool(False)
muons.FillShoweringInfo = cms.bool(False)
muons.FillCosmicsIdMap = cms.bool(False)
muons.vertices = cms.InputTag("hiSelectedVertex")
muons = muons.clone(
InputMuons = "hiMuons1stStep",
PFCandidates = "particleFlowTmp",
FillDetectorBasedIsolation = False,
FillPFIsolation = False,
FillSelectorMaps = False,
FillShoweringInfo = False,
FillCosmicsIdMap = False,
vertices = "hiSelectedVertex"
)
muonRecoHighLevelPbPbTask = cms.Task(muons)

# HI muon sequence (passed to RecoHI.Configuration.Reconstruction_HI_cff)
Expand Down
Loading