Backport of cms-sw#31881

rovere · Oct 30, 2020 · 391271c · 391271c
1 parent 4da60d8
commit 391271c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/RecoHGCal/TICL/python/EMStep_cff.py b/RecoHGCal/TICL/python/EMStep_cff.py
@@ -19,7 +19,7 @@
 # CA - PATTERN RECOGNITION
 
 ticlTrackstersEM = _trackstersProducer.clone(
-    filtered_mask = cms.InputTag("filteredLayerClustersEM", "EM"),
+    filtered_mask = "filteredLayerClustersEM:EM",
     original_mask = 'ticlTrackstersTrkEM',
     seeding_regions = "ticlSeedingGlobal",
     filter_on_categories = [0, 1],
@@ -51,7 +51,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
@@ -61,10 +61,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_layers_per_trackster = 6
 )
 

diff --git a/RecoHGCal/TICL/python/HADStep_cff.py b/RecoHGCal/TICL/python/HADStep_cff.py
@@ -19,7 +19,7 @@
 # CA - PATTERN RECOGNITION
 
 ticlTrackstersHAD = _trackstersProducer.clone(
-    filtered_mask = cms.InputTag("filteredLayerClustersHAD", "HAD"),
+    filtered_mask = "filteredLayerClustersHAD:HAD",
     original_mask = 'ticlTrackstersTrk',
     seeding_regions = "ticlSeedingGlobal",
     # For the moment we mask everything w/o requirements since we are last

diff --git a/RecoHGCal/TICL/python/MIPStep_cff.py b/RecoHGCal/TICL/python/MIPStep_cff.py
@@ -18,7 +18,7 @@
 # CA - PATTERN RECOGNITION
 
 ticlTrackstersMIP = _trackstersProducer.clone(
-    filtered_mask = cms.InputTag("filteredLayerClustersMIP", "MIP"),
+    filtered_mask = "filteredLayerClustersMIP:MIP",
     seeding_regions = "ticlSeedingGlobal",
     skip_layers = 3,
     min_layers_per_trackster = 10,
@@ -42,7 +42,7 @@
 
 filteredLayerClustersHFNoseMIP = filteredLayerClustersMIP.clone(
     LayerClusters = 'hgcalLayerClustersHFNose',
-    LayerClustersInputMask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"),
+    LayerClustersInputMask = "hgcalLayerClustersHFNose:InitialLayerClustersMask",
     iteration_label = "MIPn",
     algo_number = 9
 )
@@ -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_layers_per_trackster = 6
 )
 

diff --git a/RecoHGCal/TICL/python/TrkStep_cff.py b/RecoHGCal/TICL/python/TrkStep_cff.py
@@ -19,7 +19,7 @@
 # CA - PATTERN RECOGNITION
 
 ticlTrackstersTrk = _trackstersProducer.clone(
-  filtered_mask = cms.InputTag("filteredLayerClustersTrk", "Trk"),
+  filtered_mask = "filteredLayerClustersTrk:Trk",
   seeding_regions = "ticlSeedingTrk",
   original_mask = 'ticlTrackstersEM',
   filter_on_categories = [2, 4], # filter muons and charged hadrons

diff --git a/RecoHGCal/TICL/python/ticl_iterations.py b/RecoHGCal/TICL/python/ticl_iterations.py
@@ -39,11 +39,11 @@ def TICL_iterations_withReco(process):
   )
 
   process.trackstersTrk = trackstersProducer.clone(
-    filtered_mask = cms.InputTag("filteredLayerClustersTrk", "Trk"),
+    filtered_mask = "filteredLayerClustersTrk:Trk",
     seeding_regions = "ticlSeedingTrk",
     skip_layers = 3,
     min_layers_per_trackster = 5,
-    min_cos_theta = 0.99, # ~10 degrees                                              
+    min_cos_theta = 0.99, # ~10 degrees
     min_cos_pointing = 0.9
   )
 
@@ -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",
       skip_layers = 3,
       min_layers_per_trackster = 15,
@@ -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",
       skip_layers = 1,
       min_layers_per_trackster = 10,
@@ -103,11 +103,11 @@ def TICL_iterations_withReco(process):
 
 
   process.trackstersHAD = trackstersProducer.clone(
-      filtered_mask = cms.InputTag("filteredLayerClusters", "algo8"),
+      filtered_mask = "filteredLayerClusters:algo8",
       seeding_regions = "ticlSeedingGlobal",
       skip_layers = 2,
       min_layers_per_trackster = 10,
-      min_cos_theta = 0.8, 
+      min_cos_theta = 0.8,
       min_cos_pointing = 0.7
   )
 
@@ -142,13 +142,13 @@ def TICL_iterations_withReco(process):
 
   process.ticlPFValidation = ticlPFValidation
   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
 
 
@@ -171,7 +171,7 @@ def TICL_iterations(process):
   )
 
   process.trackstersMIP = trackstersProducer.clone(
-      filtered_mask = cms.InputTag("filteredLayerClustersMIP", "MIP"),
+      filtered_mask = "filteredLayerClustersMIP:MIP",
       seeding_regions = "ticlSeedingGlobal",
       skip_layers = 3,
       min_layers_per_trackster = 15,
@@ -192,7 +192,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",
       skip_layers = 2,
       min_layers_per_trackster = 15,