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

drop type specs in RecoEcal #31332

Merged
merged 4 commits into from Sep 9, 2020
Merged

drop type specs in RecoEcal #31332

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6f4450
drop type specification where original parameter exist (RecoEcal)
jeongeun Sep 2, 2020
c1a05d7
fix minor
jeongeun Sep 2, 2020
105ca96
bug fix in multi5x5SuperClusters_cfi.py
jeongeun Sep 7, 2020
802701a
bug fix 2 in multi5x5SuperClusters_cfi.py
jeongeun Sep 9, 2020
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
5 changes: 3 additions & 2 deletions RecoEcal/EgammaClusterProducers/python/correctedHybridSuperClusters_cfi.py
View file
Open in desktop
Expand Up @@ -31,5 +31,6 @@
)


uncleanedOnlyCorrectedHybridSuperClusters =correctedHybridSuperClusters.clone()
uncleanedOnlyCorrectedHybridSuperClusters.rawSuperClusterProducer = cms.InputTag("hybridSuperClusters","uncleanOnlyHybridSuperClusters")
uncleanedOnlyCorrectedHybridSuperClusters =correctedHybridSuperClusters.clone(
rawSuperClusterProducer = "hybridSuperClusters:uncleanOnlyHybridSuperClusters"
)
5 changes: 3 additions & 2 deletions RecoEcal/EgammaClusterProducers/python/correctedMulti5x5SuperClustersWithPreshower_cfi.py
View file
Open in desktop
Expand Up @@ -34,5 +34,6 @@
)


uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower = correctedMulti5x5SuperClustersWithPreshower.clone()
uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower.rawSuperClusterProducer = cms.InputTag("uncleanedOnlyMulti5x5SuperClustersWithPreshower")
uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower = correctedMulti5x5SuperClustersWithPreshower.clone(
rawSuperClusterProducer = "uncleanedOnlyMulti5x5SuperClustersWithPreshower"
)
34 changes: 17 additions & 17 deletions RecoEcal/EgammaClusterProducers/python/dynamicHybridSuperClusters_cfi.py
View file
Open in desktop
Expand Up @@ -3,22 +3,22 @@
import RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi

dynamicHybridSuperClusters = RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi.cleanedHybridSuperClusters.clone(
shapeAssociation = cms.string('dynamicHybridShapeAssoc'),
dynamicPhiRoad = cms.bool(True),
basicclusterCollection = cms.string(''),
dynamicEThresh = cms.bool(True),
shapeAssociation = 'dynamicHybridShapeAssoc',
dynamicPhiRoad = True,
basicclusterCollection = '',
dynamicEThresh = True,
bremRecoveryPset = cms.PSet(
barrel = cms.PSet(
cryVec = cms.vint32(17, 15, 13, 12, 11,
10, 9, 8, 7, 6),
cryMin = cms.int32(5),
etVec = cms.vdouble(5.0, 10.0, 15.0, 20.0, 30.0,
40.0, 45.0, 135.0, 195.0, 225.0)
),
endcap = cms.PSet(
a = cms.double(47.85),
c = cms.double(0.1201),
b = cms.double(108.8)
)
)
barrel = cms.PSet(
cryVec = cms.vint32(17, 15, 13, 12, 11,
10, 9, 8, 7, 6),
cryMin = cms.int32(5),
etVec = cms.vdouble(5.0, 10.0, 15.0, 20.0, 30.0,
40.0, 45.0, 135.0, 195.0, 225.0)
),
endcap = cms.PSet(
a = cms.double(47.85),
c = cms.double(0.1201),
b = cms.double(108.8)
)
)
)
7 changes: 4 additions & 3 deletions RecoEcal/EgammaClusterProducers/python/hybridClusteringSequence_cff.py
View file
Open in desktop
Expand Up @@ -9,9 +9,10 @@
from RecoEcal.EgammaClusterProducers.correctedHybridSuperClusters_cfi import *
# hybrid clustering sequence
#uncleanedHybridSuperClusters = RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi.hybridSuperClusters.clone()
uncleanedHybridSuperClusters = cleanedHybridSuperClusters.clone()
uncleanedHybridSuperClusters.RecHitSeverityToBeExcluded = cms.vstring()
uncleanedHybridSuperClusters.excludeFlagged = False
uncleanedHybridSuperClusters = cleanedHybridSuperClusters.clone(
RecHitSeverityToBeExcluded = [],
excludeFlagged = False
)

from RecoEcal.EgammaClusterProducers.unifiedSCCollection_cfi import *

Expand Down
5 changes: 3 additions & 2 deletions RecoEcal/EgammaClusterProducers/python/multi5x5BasicClusters_cfi.py
View file
Open in desktop
Expand Up @@ -37,5 +37,6 @@

# with no cleaning

multi5x5BasicClustersUncleaned = multi5x5BasicClustersCleaned.clone()
multi5x5BasicClustersUncleaned.RecHitFlagToBeExcluded= cms.vstring()
multi5x5BasicClustersUncleaned = multi5x5BasicClustersCleaned.clone(
RecHitFlagToBeExcluded = []
)
6 changes: 3 additions & 3 deletions RecoEcal/EgammaClusterProducers/python/multi5x5SuperClustersWithPreshower_cfi.py
View file
Open in desktop
Expand Up @@ -18,6 +18,6 @@
endcapSClusterProducer = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapSuperClusters")
)

uncleanedOnlyMulti5x5SuperClustersWithPreshower = multi5x5SuperClustersWithPreshower.clone()

uncleanedOnlyMulti5x5SuperClustersWithPreshower.endcapSClusterProducer = cms.InputTag("multi5x5SuperClusters","uncleanOnlyMulti5x5EndcapSuperClusters")
uncleanedOnlyMulti5x5SuperClustersWithPreshower = multi5x5SuperClustersWithPreshower.clone(
endcapSClusterProducer = "multi5x5SuperClusters:uncleanOnlyMulti5x5EndcapSuperClusters"
)
12 changes: 6 additions & 6 deletions RecoEcal/EgammaClusterProducers/python/multi5x5SuperClusters_cfi.py
View file
Open in desktop
Expand Up @@ -7,10 +7,10 @@
barrelSuperclusterCollection = cms.string('multi5x5BarrelSuperClusters'),
endcapEtaSearchRoad = cms.double(0.14),
barrelClusterTag = cms.InputTag('multi5x5BasicClusters',
'multi5x5BarrelBasicClustersCleaned'),
'multi5x5BarrelBasicClustersCleaned'),
dynamicPhiRoad = cms.bool(False),
endcapClusterTag= cms.InputTag('multi5x5BasicClustersCleaned',
'multi5x5EndcapBasicClusters'),
'multi5x5EndcapBasicClusters'),
barrelPhiSearchRoad = cms.double(0.8),
endcapPhiSearchRoad = cms.double(0.6),
seedTransverseEnergyThreshold = cms.double(1.0),
Expand Down Expand Up @@ -39,10 +39,10 @@
)


multi5x5SuperClustersUncleaned = multi5x5SuperClustersCleaned.clone()
multi5x5SuperClustersUncleaned.endcapClusterProducer = cms.string('multi5x5BasicClustersUncleaned')
multi5x5SuperClustersUncleaned.endcapClusterProducer = cms.string('multi5x5BasicClustersUncleaned')

multi5x5SuperClustersUncleaned = multi5x5SuperClustersCleaned.clone(
barrelClusterTag = 'multi5x5BasicClustersUncleaned:multi5x5BarrelBasicClustersCleaned',
Copy link
Contributor

Choose a reason for hiding this comment

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

    barrelClusterTag= 'multi5x5BasicClustersUncleaned:multi5x5BarrelBasicClusters'),
    endcapClusterTag= 'multi5x5BasicClustersUncleaned:multi5x5EndcapBasicClusters'),

Then, in the config above I think one should replace

    barrelClusterTag = cms.InputTag("multi5x5BasicClusters","multi5x5BarrelBasicClustersCleaned"),

with

    barrelClusterTag= 'multi5x5BasicClustersCleaned:multi5x5BarrelBasicClusters'),

I think that was another bug in the original config, which was not exposed because doBarrel = cms.bool(False),

@rchatter @argiro could you please check and confirm?

Copy link
Contributor

@perrotta perrotta Sep 8, 2020 •
edited

Choose a reason for hiding this comment

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

I've checked the event content of step2 in wf 140.53, and I confirm what I wrote above:

vector<reco::CaloCluster>             "multi5x5BasicClustersCleaned"   "multi5x5BarrelBasicClusters"   "reRECO"   
vector<reco::CaloCluster>             "multi5x5BasicClustersUncleaned"   "multi5x5BarrelBasicClusters"   "reRECO"   
vector<reco::CaloCluster>             "multi5x5BasicClustersCleaned"   "multi5x5EndcapBasicClusters"   "reRECO"   
vector<reco::CaloCluster>             "multi5x5BasicClustersUncleaned"   "multi5x5EndcapBasicClusters"   "reRECO"

Therefore, in multi5x5SuperClustersUncleaned one should add

    barrelClusterTag= 'multi5x5BasicClustersUncleaned:multi5x5BarrelBasicClusters'),
    endcapClusterTag= 'multi5x5BasicClustersUncleaned:multi5x5EndcapBasicClusters'),

while in multi5x5SuperClustersCleaned one should fix as

    barrelClusterTag = cms.InputTag('multi5x5BasicClustersCleaned',                                   
                                                         'multi5x5BarrelBasicClusters'),

(this fix simply writes the correct input collection, which is not used here nonetheless because doBarrel = cms.bool(False))

endcapClusterTag = 'multi5x5BasicClustersUncleaned:multi5x5EndcapBasicClusters'
)

multi5x5SuperClusters=cms.EDProducer("UnifiedSCCollectionProducer",
# input collections:
Expand Down
29 changes: 14 additions & 15 deletions RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterOOTECAL_cff.py
View file
Open in desktop
@@ -1,21 +1,20 @@
import FWCore.ParameterSet.Config as cms
from RecoEcal.EgammaClusterProducers.particleFlowSuperClusterECAL_cfi import *

particleFlowSuperClusterOOTECAL = particleFlowSuperClusterECAL.clone()
particleFlowSuperClusterOOTECAL.PFClusters = cms.InputTag("particleFlowClusterOOTECAL")
particleFlowSuperClusterOOTECAL.ESAssociation = cms.InputTag("particleFlowClusterOOTECAL")
particleFlowSuperClusterOOTECAL.PFBasicClusterCollectionBarrel = cms.string("particleFlowBasicClusterOOTECALBarrel")
particleFlowSuperClusterOOTECAL.PFSuperClusterCollectionBarrel = cms.string("particleFlowSuperClusterOOTECALBarrel")
particleFlowSuperClusterOOTECAL.PFBasicClusterCollectionEndcap = cms.string("particleFlowBasicClusterOOTECALEndcap")
particleFlowSuperClusterOOTECAL.PFSuperClusterCollectionEndcap = cms.string("particleFlowSuperClusterOOTECALEndcap")
particleFlowSuperClusterOOTECAL.PFBasicClusterCollectionPreshower = cms.string("particleFlowBasicClusterOOTECALPreshower")
particleFlowSuperClusterOOTECAL.PFSuperClusterCollectionEndcapWithPreshower = cms.string("particleFlowSuperClusterOOTECALEndcapWithPreshower")

## modification for Algo
particleFlowSuperClusterOOTECAL.isOOTCollection = cms.bool(True)
particleFlowSuperClusterOOTECAL.barrelRecHits = cms.InputTag("ecalRecHit","EcalRecHitsEB")
particleFlowSuperClusterOOTECAL.endcapRecHits = cms.InputTag("ecalRecHit","EcalRecHitsEE")

particleFlowSuperClusterOOTECAL = particleFlowSuperClusterECAL.clone(
PFClusters = "particleFlowClusterOOTECAL",
ESAssociation = "particleFlowClusterOOTECAL",
PFBasicClusterCollectionBarrel = "particleFlowBasicClusterOOTECALBarrel",
PFSuperClusterCollectionBarrel = "particleFlowSuperClusterOOTECALBarrel",
PFBasicClusterCollectionEndcap = "particleFlowBasicClusterOOTECALEndcap",
PFSuperClusterCollectionEndcap = "particleFlowSuperClusterOOTECALEndcap",
PFBasicClusterCollectionPreshower = "particleFlowBasicClusterOOTECALPreshower",
PFSuperClusterCollectionEndcapWithPreshower = "particleFlowSuperClusterOOTECALEndcapWithPreshower",
## modification for Algo
isOOTCollection = True,
barrelRecHits = "ecalRecHit:EcalRecHitsEB",
endcapRecHits = "ecalRecHit:EcalRecHitsEE"
)
from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy

run2_miniAOD_80XLegacy.toModify(
Expand Down
18 changes: 9 additions & 9 deletions RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py
View file
Open in desktop
Expand Up @@ -15,20 +15,20 @@
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify(
particleFlowSuperClusterHGCal,
PFClusters = cms.InputTag('particleFlowClusterHGCal'),
useRegression = cms.bool(False), #no HGCal regression yet
use_preshower = cms.bool(False),
PFBasicClusterCollectionEndcap = cms.string(""),
PFSuperClusterCollectionEndcap = cms.string(""),
PFSuperClusterCollectionEndcapWithPreshower = cms.string(""),
thresh_PFClusterEndcap = cms.double(1.5e-1), # 150 MeV threshold
dropUnseedable = cms.bool(True),
PFClusters = 'particleFlowClusterHGCal',
useRegression = False, #no HGCal regression yet
use_preshower = False,
PFBasicClusterCollectionEndcap = "",
PFSuperClusterCollectionEndcap = "",
PFSuperClusterCollectionEndcapWithPreshower = "",
thresh_PFClusterEndcap = 1.5e-1, # 150 MeV threshold
dropUnseedable = True,
)

particleFlowSuperClusterHGCalFromMultiCl = particleFlowSuperClusterHGCal.clone()
phase2_hgcal.toModify(
particleFlowSuperClusterHGCalFromMultiCl,
PFClusters = cms.InputTag('particleFlowClusterHGCalFromMultiCl')
PFClusters = 'particleFlowClusterHGCalFromMultiCl'
)
_phase2_hgcal_particleFlowSuperClusteringTask = particleFlowSuperClusteringTask.copy()
_phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCal)
Expand Down
66 changes: 33 additions & 33 deletions RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py
View file
Open in desktop
Expand Up @@ -3,72 +3,72 @@
import RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi

interestingEcalDetIdEB = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("hybridSuperClusters","hybridBarrelBasicClusters"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB")
basicClustersLabel = "hybridSuperClusters:hybridBarrelBasicClusters",
recHitsLabel = "ecalRecHit:EcalRecHitsEB"
)

interestingEcalDetIdEBU = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("hybridSuperClusters","uncleanOnlyHybridBarrelBasicClusters"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB")
basicClustersLabel = "hybridSuperClusters:uncleanOnlyHybridBarrelBasicClusters",
recHitsLabel = "ecalRecHit:EcalRecHitsEB"
)

interestingEcalDetIdEE = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("multi5x5SuperClusters","multi5x5EndcapBasicClusters"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE")
basicClustersLabel = "multi5x5SuperClusters:multi5x5EndcapBasicClusters",
recHitsLabel = "ecalRecHit:EcalRecHitsEE"
)

interestingEcalDetIdPFEB = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterECAL","particleFlowBasicClusterECALBarrel"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB")
basicClustersLabel = "particleFlowSuperClusterECAL:particleFlowBasicClusterECALBarrel",
recHitsLabel = "ecalRecHit:EcalRecHitsEB"
)

interestingEcalDetIdPFEE = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterECAL","particleFlowBasicClusterECALEndcap"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE")
basicClustersLabel = "particleFlowSuperClusterECAL:particleFlowBasicClusterECALEndcap",
recHitsLabel = "ecalRecHit:EcalRecHitsEE"
)

interestingEcalDetIdPFES = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterECAL","particleFlowBasicClusterECALPreshower"),
recHitsLabel = cms.InputTag("ecalPreshowerRecHit","EcalRecHitsES"),
severityLevel = cms.int32(-1),
keepNextToDead = cms.bool(False),
keepNextToBoundary = cms.bool(False)
basicClustersLabel = "particleFlowSuperClusterECAL:particleFlowBasicClusterECALPreshower",
recHitsLabel = "ecalPreshowerRecHit:EcalRecHitsES",
severityLevel = -1,
keepNextToDead = False,
keepNextToBoundary = False
)

interestingEcalDetIdOOTPFEB = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterOOTECAL","particleFlowBasicClusterOOTECALBarrel"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB")
basicClustersLabel = "particleFlowSuperClusterOOTECAL:particleFlowBasicClusterOOTECALBarrel",
recHitsLabel = "ecalRecHit:EcalRecHitsEB"
)

interestingEcalDetIdOOTPFEE = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterOOTECAL","particleFlowBasicClusterOOTECALEndcap"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE")
basicClustersLabel = "particleFlowSuperClusterOOTECAL:particleFlowBasicClusterOOTECALEndcap",
recHitsLabel = "ecalRecHit:EcalRecHitsEE"
)

interestingEcalDetIdOOTPFES = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowSuperClusterOOTECAL","particleFlowBasicClusterOOTECALPreshower"),
recHitsLabel = cms.InputTag("ecalPreshowerRecHit","EcalRecHitsES"),
severityLevel = cms.int32(-1),
keepNextToDead = cms.bool(False),
keepNextToBoundary = cms.bool(False)
basicClustersLabel = "particleFlowSuperClusterOOTECAL:particleFlowBasicClusterOOTECALPreshower",
recHitsLabel = "ecalPreshowerRecHit:EcalRecHitsES",
severityLevel = -1,
keepNextToDead = False,
keepNextToBoundary = False
)

interestingEcalDetIdRefinedEB = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowEGamma","EBEEClusters"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB")
basicClustersLabel = "particleFlowEGamma:EBEEClusters",
recHitsLabel = "ecalRecHit:EcalRecHitsEB"
)

interestingEcalDetIdRefinedEE = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowEGamma","EBEEClusters"),
recHitsLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE")
basicClustersLabel = "particleFlowEGamma:EBEEClusters",
recHitsLabel = "ecalRecHit:EcalRecHitsEE"
)

interestingEcalDetIdRefinedES = RecoEcal.EgammaClusterProducers.interestingDetIdCollectionProducer_cfi.interestingDetIdCollectionProducer.clone(
basicClustersLabel = cms.InputTag("particleFlowEGamma","ESClusters"),
recHitsLabel = cms.InputTag("ecalPreshowerRecHit","EcalRecHitsES"),
severityLevel = cms.int32(-1),
keepNextToDead = cms.bool(False),
keepNextToBoundary = cms.bool(False)
basicClustersLabel = "particleFlowEGamma:ESClusters",
recHitsLabel = "ecalPreshowerRecHit:EcalRecHitsES",
severityLevel = -1,
keepNextToDead = False,
keepNextToBoundary = False
)

# rechits associated to high pt tracks for HSCP
Expand Down