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

[HGCAL] Update TICL iterations naming #33336

Merged
merged 7 commits into from Apr 9, 2021
Merged

[HGCAL] Update TICL iterations naming #33336

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dab901f
Create iterations list
lecriste Apr 5, 2021
e1bc136
Update itername to new naming
lecriste Apr 5, 2021
8e9cd50
Remove duplicate hard-code labels
lecriste Apr 5, 2021
46ca254
Update itername to new naming
lecriste Apr 5, 2021
47544a3
Uniform python label
lecriste Apr 6, 2021
783b6b5
Propagate new iteration label
lecriste Apr 6, 2021
6a889d4
Restore TrkHAD -> Trk
lecriste Apr 6, 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
4 changes: 2 additions & 2 deletions RecoHGCal/TICL/plugins/TrackstersProducer.cc
View file
Open in desktop
Expand Up @@ -102,9 +102,9 @@ TrackstersProducer::TrackstersProducer(const edm::ParameterSet& ps, const Tracks
iterIndex_ = ticl::Trackster::TRKEM;
else if (itername_ == "EM")
iterIndex_ = ticl::Trackster::EM;
else if (itername_ == "TRK")
else if (itername_ == "TrkHAD")
iterIndex_ = ticl::Trackster::TRKHAD;
else if (itername_ == "HADRONIC")
else if (itername_ == "HAD")
iterIndex_ = ticl::Trackster::HAD;
else if (itername_ == "MIP")
iterIndex_ = ticl::Trackster::MIP;
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/python/HADStep_cff.py
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
min_cos_theta = 0.866, # ~30 degrees
min_cos_pointing = 0.819, # ~35 degrees
max_delta_time = -1,
itername = "HADRONIC"
itername = "HAD"
)

# MULTICLUSTERS
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/python/TrkStep_cff.py
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
algo_verbosity = 2,
oneTracksterPerTrackSeed = True,
promoteEmptyRegionToTrackster = True,
itername = "TRK"
itername = "TrkHAD"
lecriste marked this conversation as resolved.
Show resolved Hide resolved
)

# MULTICLUSTERS
Expand Down
12 changes: 9 additions & 3 deletions RecoHGCal/TICL/python/iterativeTICL_cff.py
View file
Open in desktop
Expand Up @@ -22,14 +22,20 @@
pfTICL = _pfTICLProducer.clone()
ticlPFTask = cms.Task(pfTICL)

iterTICLTask = cms.Task(ticlLayerTileTask
,ticlTrkEMStepTask
ticlIterations = cms.Task(
lecriste marked this conversation as resolved.
Show resolved Hide resolved
ticlTrkEMStepTask
,ticlEMStepTask
,ticlTrkStepTask
,ticlHADStepTask
)
ticlIterLabels = [_step.itername.value() for _iteration in ticlIterations for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")]

lecriste marked this conversation as resolved.
Show resolved Hide resolved
iterTICLTask = cms.Task(ticlLayerTileTask
,ticlIterations
,ticlTracksterMergeTask
,ticlPFTask
)
)
ticlIterLabelsMerge = ticlIterLabels + ["Merge"]

ticlLayerTileHFNose = ticlLayerTileProducer.clone(
detector = 'HFNose'
Expand Down
20 changes: 8 additions & 12 deletions Validation/HGCalValidation/python/HGCalValidator_cfi.py
View file
Open in desktop
Expand Up @@ -7,6 +7,12 @@
from SimCalorimetry.HGCalAssociatorProducers.LCToSCAssociation_cfi import layerClusterSimClusterAssociation

from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer

from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabels, ticlIterLabelsMerge

labelMcl = [cms.InputTag("ticlMultiClustersFromTracksters"+iteration) for iteration in ticlIterLabelsMerge]
lcInputMask = [cms.InputTag("ticlTracksters"+iteration) for iteration in ticlIterLabels]

hgcalValidator = DQMEDAnalyzer(
"HGCalValidator",

Expand All @@ -17,12 +23,7 @@
### reco input configuration ###
#2dlayerclusters, pfclusters, multiclusters
label_lcl = layerClusterCaloParticleAssociation.label_lc,
label_mcl = cms.VInputTag(
cms.InputTag("ticlMultiClustersFromTrackstersTrk"),
cms.InputTag("ticlMultiClustersFromTrackstersTrkEM"),
cms.InputTag("ticlMultiClustersFromTrackstersEM"),
cms.InputTag("ticlMultiClustersFromTrackstersHAD"),
cms.InputTag("ticlMultiClustersFromTrackstersMerge")),
label_mcl = cms.VInputTag(labelMcl),

associator = cms.untracked.InputTag("layerClusterCaloParticleAssociationProducer"),

Expand Down Expand Up @@ -54,12 +55,7 @@

simVertices = cms.InputTag("g4SimHits"),

LayerClustersInputMask = cms.VInputTag(
cms.InputTag("ticlTrackstersTrkEM"),
cms.InputTag("ticlTrackstersEM"),
cms.InputTag("ticlTrackstersTrk"),
cms.InputTag("ticlTrackstersHAD")
),
LayerClustersInputMask = cms.VInputTag(lcInputMask),

#Total number of layers of HGCal that we want to monitor
#Could get this also from HGCalImagingAlgo::maxlayer but better to get it from here
Expand Down
17 changes: 6 additions & 11 deletions Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py
View file
Open in desktop
@@ -1,5 +1,6 @@
import FWCore.ParameterSet.Config as cms
from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabelsMerge

maxlayerzm = 50# last layer of BH -z
maxlayerzp = 100# last layer of BH +z
Expand Down Expand Up @@ -33,14 +34,9 @@
eff_simclusters.extend(["merge_eta_layer{:02d} 'LayerCluster Merge Rate vs #eta Layer{:02d} in z-' NumMerge_LayerCluster_in_SimCluster_Eta_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Eta_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) if (i<maxlayerzm) else "merge_eta_layer{:02d} 'LayerCluster Merge Rate vs #eta Layer{:02d} in z+' NumMerge_LayerCluster_in_SimCluster_Eta_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Eta_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) for i in range(maxlayerzp) ])
eff_simclusters.extend(["merge_phi_layer{:02d} 'LayerCluster Merge Rate vs #phi Layer{:02d} in z-' NumMerge_LayerCluster_in_SimCluster_Phi_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Phi_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) if (i<maxlayerzm) else "merge_phi_layer{:02d} 'LayerCluster Merge Rate vs #phi Layer{:02d} in z+' NumMerge_LayerCluster_in_SimCluster_Phi_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Phi_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) for i in range(maxlayerzp) ])

subdirsSim.extend('HGCAL/HGCalValidator/simClusters/ticlTracksters'+iteration+'/' for iteration in ticlIterLabelsMerge)
postProcessorHGCALsimclusters= DQMEDHarvester('DQMGenericClient',
subDirs = cms.untracked.vstring(
'HGCAL/HGCalValidator/simClusters/ticlTrackstersTrkEM',
'HGCAL/HGCalValidator/simClusters/ticlTrackstersEM',
'HGCAL/HGCalValidator/simClusters/ticlTrackstersTrk',
'HGCAL/HGCalValidator/simClusters/ticlTrackstersHAD',
'HGCAL/HGCalValidator/simClusters/ticlTrackstersMerge'
),
subDirs = cms.untracked.vstring(subdirsSim),
efficiency = cms.vstring(eff_simclusters),
resolution = cms.vstring(),
cumulativeDists = cms.untracked.vstring(),
Expand All @@ -57,12 +53,11 @@
eff_multiclusters.extend(["merge_eta 'MultiCluster Merge Rate vs #eta' NumMerge_MultiCluster_Eta Denom_MultiCluster_Eta"])
eff_multiclusters.extend(["merge_phi 'MultiCluster Merge Rate vs #phi' NumMerge_MultiCluster_Phi Denom_MultiCluster_Phi"])

subdirs = ['HGCAL/HGCalValidator/hgcalMultiClusters/']
iterations = ['TrkEM','EM','Trk','HAD','Merge']
subdirs.extend('HGCAL/HGCalValidator/ticlMultiClustersFromTracksters'+iteration+'/' for iteration in iterations)
subdirsMult = ['HGCAL/HGCalValidator/hgcalMultiClusters/']
subdirsMult.extend('HGCAL/HGCalValidator/ticlMultiClustersFromTracksters'+iteration+'/' for iteration in ticlIterLabelsMerge)

postProcessorHGCALmulticlusters = DQMEDHarvester('DQMGenericClient',
subDirs = cms.untracked.vstring(subdirs),
subDirs = cms.untracked.vstring(subdirsMult),
efficiency = cms.vstring(eff_multiclusters),
resolution = cms.vstring(),
cumulativeDists = cms.untracked.vstring(),
Expand Down