Skip to content

Commit 3ac2c6c

Browse files
AuroraPeregoAuroraPerego
committed
fix method for TICLv5 rereco
1 parent c5d0e3a commit 3ac2c6c

File tree

2 files changed

+20
-87
lines changed

2 files changed

+20
-87
lines changed

‎RecoHGCal/TICL/python/customiseForTICLv5_cff.py‎

Lines changed: 19 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,36 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from RecoLocalCalo.HGCalRecProducers.hgcalLayerClusters_cff import hgcalLayerClustersEE, hgcalLayerClustersHSi, hgcalLayerClustersHSci
4-
from RecoLocalCalo.HGCalRecProducers.hgcalMergeLayerClusters_cfi import hgcalMergeLayerClusters
5-
from RecoTracker.IterativeTracking.iterativeTk_cff import trackdnn_source
6-
from RecoLocalCalo.HGCalRecProducers.hgcalRecHitMapProducer_cfi import hgcalRecHitMapProducer
7-
8-
from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer
9-
10-
from RecoHGCal.TICL.CLUE3DEM_cff import *
11-
from RecoHGCal.TICL.CLUE3DHAD_cff import *
12-
from RecoHGCal.TICL.pfTICLProducer_cfi import pfTICLProducer as _pfTICLProducer
13-
14-
from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer
15-
from RecoHGCal.TICL.tracksterSelectionTf_cfi import *
16-
17-
from RecoHGCal.TICL.tracksterLinksProducer_cfi import tracksterLinksProducer as _tracksterLinksProducer
18-
from RecoHGCal.TICL.ticlCandidateProducer_cfi import ticlCandidateProducer as _ticlCandidateProducer
19-
from RecoHGCal.Configuration.RecoHGCal_EventContent_cff import customiseForTICLv5EventContent
20-
from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabels, ticlIterLabelsMerge
213
from RecoHGCal.TICL.ticlDumper_cfi import ticlDumper
22-
from RecoHGCal.TICL.mergedTrackstersProducer_cfi import mergedTrackstersProducer as _mergedTrackstersProducer
4+
from RecoHGCal.Configuration.RecoHGCal_EventContent_cff import customiseForTICLv5EventContent
235
from SimCalorimetry.HGCalAssociatorProducers.TSToSimTSAssociation_cfi import tracksterSimTracksterAssociationLinkingbyCLUE3D as _tracksterSimTracksterAssociationLinkingbyCLUE3D
246
from SimCalorimetry.HGCalAssociatorProducers.TSToSimTSAssociation_cfi import tracksterSimTracksterAssociationPRbyCLUE3D as _tracksterSimTracksterAssociationPRbyCLUE3D
25-
from Validation.HGCalValidation.HGCalValidator_cff import hgcalValidator
26-
from RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi import HGCalUncalibRecHit
27-
from RecoHGCal.TICL.SimTracksters_cff import ticlSimTracksters, ticlSimTrackstersTask
28-
29-
from RecoHGCal.TICL.FastJetStep_cff import ticlTrackstersFastJet
30-
from RecoHGCal.TICL.EMStep_cff import ticlTrackstersEM, ticlTrackstersHFNoseEM
31-
from RecoHGCal.TICL.TrkStep_cff import ticlTrackstersTrk, ticlTrackstersHFNoseTrk
32-
from RecoHGCal.TICL.MIPStep_cff import ticlTrackstersMIP, ticlTrackstersHFNoseMIP
33-
from RecoHGCal.TICL.HADStep_cff import ticlTrackstersHAD, ticlTrackstersHFNoseHAD
34-
from RecoHGCal.TICL.CLUE3DEM_cff import ticlTrackstersCLUE3DEM
35-
from RecoHGCal.TICL.CLUE3DHAD_cff import ticlTrackstersCLUE3DHAD
36-
from RecoHGCal.TICL.CLUE3DHighStep_cff import ticlTrackstersCLUE3DHigh
37-
from RecoHGCal.TICL.TrkEMStep_cff import ticlTrackstersTrkEM, filteredLayerClustersHFNoseTrkEM
38-
39-
from RecoHGCal.TICL.mtdSoAProducer_cfi import mtdSoAProducer as _mtdSoAProducer
407

418
def customiseTICLv5FromReco(process, enableDumper = False):
429
# TensorFlow ESSource
43-
4410
process.TFESSource = cms.Task(process.trackdnn_source)
4511

12+
# Reconstruction
4613
process.hgcalLayerClustersTask = cms.Task(process.hgcalLayerClustersEE,
4714
process.hgcalLayerClustersHSi,
4815
process.hgcalLayerClustersHSci,
4916
process.hgcalMergeLayerClusters)
5017

51-
# Reconstruction
52-
53-
process.ticlSimTracksters.computeLocalTime = cms.bool(True)
54-
55-
process.ticlTrackstersCLUE3DHigh.pluginPatternRecognitionByCLUE3D.computeLocalTime = cms.bool(True)
56-
57-
'''for future CLUE3D separate iterations
58-
process.ticlTrackstersCLUE3DHAD.pluginPatternRecognitionByCLUE3D.computeLocalTime = cms.bool(True)
59-
process.ticlTrackstersCLUE3DEM.pluginPatternRecognitionByCLUE3D.computeLocalTime = cms.bool(True)
60-
'''
61-
62-
process.ticlLayerTileTask = cms.Task(ticlLayerTileProducer)
63-
6418
process.ticlIterationsTask = cms.Task(
65-
process.ticlTrackstersCLUE3DHigh,
19+
process.ticlCLUE3DHighStepTask,
20+
process.ticlTracksterLinksTask,
21+
process.ticlPassthroughStepTask
6622
)
6723

68-
process.mtdSoA = _mtdSoAProducer.clone()
69-
process.mtdSoATask = cms.Task(process.mtdSoA)
70-
71-
process.ticlTracksterLinks = _tracksterLinksProducer.clone()
72-
process.ticlTracksterLinks = _tracksterLinksProducer.clone(
73-
tracksters_collections = cms.VInputTag(
74-
'ticlTrackstersCLUE3DHigh'
75-
),
76-
)
24+
process.mergeTICLTask = cms.Task()
7725

78-
process.ticlCandidate = _ticlCandidateProducer.clone()
79-
process.ticlCandidateTask = cms.Task(process.ticlCandidate)
26+
process.iterTICLTask = cms.Path(process.hgcalLayerClustersTask,
27+
process.TFESSource,
28+
process.ticlLayerTileTask,
29+
process.mtdSoATask,
30+
process.mergeTICLTask,
31+
process.ticlIterationsTask,
32+
process.ticlCandidateTask,
33+
process.ticlPFTask)
8034

8135
process.tracksterSimTracksterAssociationLinkingbyCLUE3DHigh = _tracksterSimTracksterAssociationLinkingbyCLUE3D.clone(
8236
label_tst = cms.InputTag("ticlTrackstersCLUE3DHigh")
@@ -108,29 +62,7 @@ def customiseTICLv5FromReco(process, enableDumper = False):
10862
)
10963
'''
11064

111-
112-
process.iterTICLTask = cms.Path(process.hgcalLayerClustersTask,
113-
process.TFESSource,
114-
process.ticlLayerTileTask,
115-
process.mtdSoATask,
116-
process.ticlIterationsTask,
117-
process.ticlTracksterLinksTask,
118-
process.ticlCandidateTask)
119-
120-
process.particleFlowClusterHGCal.initialClusteringStep.tracksterSrc = "ticlCandidate"
121-
process.globalrecoTask.remove(process.ticlTrackstersMerge)
122-
123-
process.tracksterSimTracksterAssociationLinking.label_tst = cms.InputTag("ticlCandidate")
124-
process.tracksterSimTracksterAssociationPR.label_tst = cms.InputTag("ticlCandidate")
125-
126-
process.tracksterSimTracksterAssociationLinkingPU.label_tst = cms.InputTag("ticlCandidate")
127-
process.tracksterSimTracksterAssociationPRPU.label_tst = cms.InputTag("ticlCandidate")
128-
process.mergeTICLTask = cms.Task()
129-
process.pfTICL = _pfTICLProducer.clone(
130-
ticlCandidateSrc = cms.InputTag('ticlCandidate'),
131-
isTICLv5 = cms.bool(True)
132-
)
133-
process.hgcalAssociators = cms.Task(process.hgcalRecHitMapProducer, process.lcAssocByEnergyScoreProducer, process.layerClusterCaloParticleAssociationProducer,
65+
process.hgcalAssociators = cms.Task(process.recHitMapProducer, process.lcAssocByEnergyScoreProducer, process.layerClusterCaloParticleAssociationProducer,
13466
process.scAssocByEnergyScoreProducer, process.layerClusterSimClusterAssociationProducer,
13567
process.lcSimTSAssocByEnergyScoreProducer, process.layerClusterSimTracksterAssociationProducer,
13668
process.simTsAssocByEnergyScoreProducer, process.simTracksterHitLCAssociatorByEnergyScoreProducer,
@@ -165,11 +97,12 @@ def customiseTICLv5FromReco(process, enableDumper = False):
16597
fileName=cms.string("histo.root")
16698
)
16799

168-
process.FEVTDEBUGHLToutput_step = cms.EndPath(process.ticlDumper)
100+
process.FEVTDEBUGHLToutput_step = cms.EndPath(process.ticlDumper)
169101

170-
process.TICL_Validation = cms.Path(process.ticlSimTrackstersTask, process.hgcalAssociators)
102+
process.TICL_Validator = cms.Task(process.hgcalValidator)
103+
process.TICL_Validation = cms.Path(process.ticlSimTrackstersTask, process.hgcalAssociators, process.TICL_Validator)
171104

172-
# Schedule definition
105+
# Schedule definition
173106
process.schedule = cms.Schedule(process.iterTICLTask,
174107
process.TICL_Validation,
175108
process.FEVTDEBUGHLToutput_step)

‎RecoHGCal/TICL/python/iterativeTICL_cff.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
mtdSoA = _mtdSoAProducer.clone()
3838

3939
pfTICL = _pfTICLProducer.clone()
40-
ticl_v5.toModify(pfTICL, ticlCandidateSrc = cms.InputTag('ticlCandidate'), isTICLv5 = cms.bool(True))
40+
ticl_v5.toModify(pfTICL, ticlCandidateSrc = cms.InputTag('ticlCandidate'), isTICLv5 = cms.bool(True), useTimingAverage=True)
4141

4242
ticlPFTask = cms.Task(pfTICL)
4343

0 commit comments

Comments
 (0)