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 RecoHGCal #31881

Merged
merged 1 commit into from Oct 21, 2020
Merged

drop type specs in RecoHGCal #31881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions RecoHGCal/TICL/python/EMStep_cff.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
# CA - PATTERN RECOGNITION

ticlTrackstersEM = _trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersEM", "EM"),
filtered_mask = "filteredLayerClustersEM:EM",
original_mask = 'ticlTrackstersTrk',
seeding_regions = "ticlSeedingGlobal",
filter_on_categories = [0, 1],
Expand Down Expand Up @@ -46,7 +46,7 @@

filteredLayerClustersHFNoseEM = filteredLayerClustersEM.clone(
LayerClusters = 'hgcalLayerClustersHFNose',
LayerClustersInputMask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"),
LayerClustersInputMask = "hgcalLayerClustersHFNose:InitialLayerClustersMask",
iteration_label = "EMn",
algo_number = 9
#no tracking mask for EM for now
Expand All @@ -56,10 +56,10 @@
detector = "HFNose",
layer_clusters = "hgcalLayerClustersHFNose",
layer_clusters_hfnose_tiles = "ticlLayerTileHFNose",
original_mask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"),
filtered_mask = cms.InputTag("filteredLayerClustersHFNoseEM","EMn"),
original_mask = "hgcalLayerClustersHFNose:InitialLayerClustersMask",
filtered_mask = "filteredLayerClustersHFNoseEM:EMn",
seeding_regions = "ticlSeedingGlobalHFNose",
time_layerclusters = cms.InputTag("hgcalLayerClustersHFNose","timeLayerCluster"),
time_layerclusters = "hgcalLayerClustersHFNose:timeLayerCluster",
min_clusters_per_ntuplet = 6
)

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/python/HADStep_cff.py
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
# CA - PATTERN RECOGNITION

ticlTrackstersHAD = _trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersHAD", "HAD"),
filtered_mask = "filteredLayerClustersHAD:HAD",
original_mask = 'ticlTrackstersEM',
seeding_regions = "ticlSeedingGlobal",
# For the moment we mask everything w/o requirements since we are last
Expand Down
10 changes: 5 additions & 5 deletions RecoHGCal/TICL/python/MIPStep_cff.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
# CA - PATTERN RECOGNITION

ticlTrackstersMIP = _trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersMIP", "MIP"),
filtered_mask = "filteredLayerClustersMIP:MIP",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 3,
min_clusters_per_ntuplet = 10,
Expand All @@ -42,7 +42,7 @@

filteredLayerClustersHFNoseMIP = filteredLayerClustersMIP.clone(
LayerClusters = 'hgcalLayerClustersHFNose',
LayerClustersInputMask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"),
LayerClustersInputMask = "hgcalLayerClustersHFNose:InitialLayerClustersMask",
iteration_label = "MIPn",
algo_number = 9
)
Expand All @@ -51,10 +51,10 @@
detector = "HFNose",
layer_clusters = "hgcalLayerClustersHFNose",
layer_clusters_hfnose_tiles = "ticlLayerTileHFNose",
original_mask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"),
filtered_mask = cms.InputTag("filteredLayerClustersHFNoseMIP","MIPn"),
original_mask = "hgcalLayerClustersHFNose:InitialLayerClustersMask",
filtered_mask = "filteredLayerClustersHFNoseMIP:MIPn",
seeding_regions = "ticlSeedingGlobalHFNose",
time_layerclusters = cms.InputTag("hgcalLayerClustersHFNose","timeLayerCluster"),
time_layerclusters = "hgcalLayerClustersHFNose:timeLayerCluster",
min_clusters_per_ntuplet = 6
)

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/python/TrkStep_cff.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
# CA - PATTERN RECOGNITION

ticlTrackstersTrk = _trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersTrk", "Trk"),
filtered_mask = "filteredLayerClustersTrk:Trk",
seeding_regions = "ticlSeedingTrk",
filter_on_categories = [2, 4], # filter muons and charged hadrons
pid_threshold = 0.0,
Expand Down
17 changes: 8 additions & 9 deletions RecoHGCal/TICL/python/ticl_iterations.py
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ def TICL_iterations_withReco(process):
)

process.trackstersTrk = trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersTrk", "Trk"),
filtered_mask = "filteredLayerClustersTrk:Trk",
seeding_regions = "ticlSeedingTrk",
missing_layers = 3,
min_clusters_per_ntuplet = 5,
Expand All @@ -64,7 +64,7 @@ def TICL_iterations_withReco(process):
)

process.trackstersMIP = trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersMIP", "MIP"),
filtered_mask = "filteredLayerClustersMIP:MIP",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 3,
min_clusters_per_ntuplet = 15,
Expand All @@ -89,7 +89,7 @@ def TICL_iterations_withReco(process):
process.trackstersEM = trackstersProducer.clone(
max_out_in_hops = 4,
original_mask = "trackstersMIP",
filtered_mask = cms.InputTag("filteredLayerClusters", "algo8"),
filtered_mask = "filteredLayerClusters:algo8",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 1,
min_clusters_per_ntuplet = 10,
Expand All @@ -103,7 +103,7 @@ def TICL_iterations_withReco(process):


process.trackstersHAD = trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClusters", "algo8"),
filtered_mask = "filteredLayerClusters:algo8",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 2,
min_clusters_per_ntuplet = 10,
Expand Down Expand Up @@ -144,9 +144,8 @@ def TICL_iterations_withReco(process):
process.hgcalValidation.insert(-1, process.ticlPFValidation)

if getattr(process,'hgcalValidator'):
process.hgcalValidator.label_lcl = cms.InputTag("hgcalLayerClusters")
process.hgcalValidator.label_mcl = cms.VInputTag(cms.InputTag("multiClustersFromTrackstersEM", "MultiClustersFromTracksterByCA"), cms.InputTag("multiClustersFromTrackstersHAD", "MultiClustersFromTracksterByCA"))

process.hgcalValidator.label_lcl = "hgcalLayerClusters"
process.hgcalValidator.label_mcl = ["multiClustersFromTrackstersEM:MultiClustersFromTracksterByCA", "multiClustersFromTrackstersHAD:MultiClustersFromTracksterByCA"]
process.hgcalValidator.domulticlustersPlots = True

return process
Expand All @@ -171,7 +170,7 @@ def TICL_iterations(process):
)

process.trackstersMIP = trackstersProducer.clone(
filtered_mask = cms.InputTag("filteredLayerClustersMIP", "MIP"),
filtered_mask = "filteredLayerClustersMIP:MIP",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 3,
min_clusters_per_ntuplet = 15,
Expand All @@ -192,7 +191,7 @@ def TICL_iterations(process):

process.tracksters = trackstersProducer.clone(
original_mask = "trackstersMIP",
filtered_mask = cms.InputTag("filteredLayerClusters", "algo8"),
filtered_mask = "filteredLayerClusters:algo8",
seeding_regions = "ticlSeedingGlobal",
missing_layers = 2,
min_clusters_per_ntuplet = 15,
Expand Down