[EGM HLT@Phase2] Move to TICL v4

HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersEML1Seeded_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHighL1Seeded_cfi.py

@@ -1,14 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
-filteredLayerClustersEML1Seeded = cms.EDProducer("FilteredLayerClustersProducer",
+filteredLayerClustersCLUE3DHighL1Seeded = cms.EDProducer("FilteredLayerClustersProducer",
     LayerClusters = cms.InputTag("hgcalLayerClustersL1Seeded"),
     LayerClustersInputMask = cms.InputTag("hgcalLayerClustersL1Seeded","InitialLayerClustersMask"),
     algo_number = cms.int32(8),
-    clusterFilter = cms.string('ClusterFilterByAlgoAndSizeAndLayerRange'),
-    iteration_label = cms.string('EM'),
+    clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
+    iteration_label = cms.string('CLUE3DHigh'),
     max_cluster_size = cms.int32(9999),
-    max_layerId = cms.int32(30),
+    max_layerId = cms.int32(9999),
     mightGet = cms.optional.untracked.vstring,
-    min_cluster_size = cms.int32(3),
+    min_cluster_size = cms.int32(2),
     min_layerId = cms.int32(0)
 )

HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersHADForEgamma_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHigh_cfi.py

@@ -1,14 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
-filteredLayerClustersHADForEgamma = cms.EDProducer("FilteredLayerClustersProducer",
+filteredLayerClustersCLUE3DHigh = cms.EDProducer("FilteredLayerClustersProducer",
     LayerClusters = cms.InputTag("hgcalLayerClusters"),
-    LayerClustersInputMask = cms.InputTag("ticlTrackstersEMForEgamma"),
+    LayerClustersInputMask = cms.InputTag("hgcalLayerClusters","InitialLayerClustersMask"),
     algo_number = cms.int32(8),
     clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
-    iteration_label = cms.string('HAD'),
+    iteration_label = cms.string('CLUE3DHigh'),
     max_cluster_size = cms.int32(9999),
     max_layerId = cms.int32(9999),
     mightGet = cms.optional.untracked.vstring,
-    min_cluster_size = cms.int32(3),
+    min_cluster_size = cms.int32(2),
     min_layerId = cms.int32(0)
 )

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLL1Seeded_cfi.py

@@ -7,13 +7,13 @@
     initialClusteringStep = cms.PSet(
         algoName = cms.string('PFClusterFromHGCalTrackster'),
         clusterSrc = cms.InputTag("hgcalLayerClustersL1Seeded"),
-        filterByTracksterIteration = cms.bool(True),
-        filterByTracksterPID = cms.bool(False),
+        filterByTracksterIteration = cms.bool(False),
+        filterByTracksterPID = cms.bool(True),
         filter_on_categories = cms.vint32(0, 1),
         filter_on_iterations = cms.vint32(0, 1),
         pid_threshold = cms.double(0.8),
         thresholdsByDetector = cms.VPSet(),
-        tracksterSrc = cms.InputTag("ticlTrackstersEML1")
+        tracksterSrc = cms.InputTag("ticlTrackstersCLUE3DHighL1Seeded")
     ),
     pfClusterBuilder = cms.PSet(
 

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLUnseeded_cfi.py

@@ -7,13 +7,13 @@
     initialClusteringStep = cms.PSet(
         algoName = cms.string('PFClusterFromHGCalTrackster'),
         clusterSrc = cms.InputTag("hgcalLayerClusters"),
-        filterByTracksterIteration = cms.bool(True),
-        filterByTracksterPID = cms.bool(False),
+        filterByTracksterIteration = cms.bool(False),
+        filterByTracksterPID = cms.bool(True),
         filter_on_categories = cms.vint32(0, 1),
         filter_on_iterations = cms.vint32(0, 1),
         pid_threshold = cms.double(0.8),
         thresholdsByDetector = cms.VPSet(),
-        tracksterSrc = cms.InputTag("ticlTrackstersEMForEgamma")
+        tracksterSrc = cms.InputTag("ticlTrackstersCLUE3DHigh")
     ),
     pfClusterBuilder = cms.PSet(
 

HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersEML1_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHighL1Seeded_cfi.py

@@ -1,15 +1,15 @@
 import FWCore.ParameterSet.Config as cms
 
-ticlTrackstersEML1 = cms.EDProducer("TrackstersProducer",
+ticlTrackstersCLUE3DHighL1Seeded = cms.EDProducer("TrackstersProducer",
     detector = cms.string('HGCAL'),
-    filtered_mask = cms.InputTag("filteredLayerClustersEML1Seeded","EM"),
-    itername = cms.string('EM'),
+    filtered_mask = cms.InputTag("filteredLayerClustersCLUE3DHighL1Seeded","CLUE3DHigh"),
+    itername = cms.string('CLUE3DHigh'),
     layer_clusters = cms.InputTag("hgcalLayerClustersL1Seeded"),
     layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"),
     layer_clusters_tiles = cms.InputTag("ticlLayerTileProducerL1Seeded"),
     mightGet = cms.optional.untracked.vstring,
     original_mask = cms.InputTag("hgcalLayerClustersL1Seeded","InitialLayerClustersMask"),
-    patternRecognitionBy = cms.string('CA'),
+    patternRecognitionBy = cms.string('CLUE3D'),
     pluginPatternRecognitionByCA = cms.PSet(
         algo_verbosity = cms.int32(0),
         eid_input_name = cms.string('input'),
@@ -18,42 +18,51 @@
         eid_n_layers = cms.int32(50),
         eid_output_name_energy = cms.string('output/regressed_energy'),
         eid_output_name_id = cms.string('output/id_probabilities'),
-        energy_em_over_total_threshold = cms.double(0.9),
+        energy_em_over_total_threshold = cms.double(-1),
         etaLimitIncreaseWindow = cms.double(2.1),
-        filter_on_categories = cms.vint32(0, 1),
+        filter_on_categories = cms.vint32(0),
         max_delta_time = cms.double(3),
-        max_longitudinal_sigmaPCA = cms.double(10),
-        max_missing_layers_in_trackster = cms.int32(1),
-        max_out_in_hops = cms.int32(1),
-        min_cos_pointing = cms.double(0.9),
-        min_cos_theta = cms.double(0.97),
+        max_longitudinal_sigmaPCA = cms.double(9999),
+        max_missing_layers_in_trackster = cms.int32(9999),
+        max_out_in_hops = cms.int32(10),
+        min_cos_pointing = cms.double(-1),
+        min_cos_theta = cms.double(0.915),
         min_layers_per_trackster = cms.int32(10),
         oneTracksterPerTrackSeed = cms.bool(False),
         out_in_dfs = cms.bool(True),
-        pid_threshold = cms.double(0.5),
+        pid_threshold = cms.double(0),
         promoteEmptyRegionToTrackster = cms.bool(False),
         root_doublet_max_distance_from_seed_squared = cms.double(9999),
-        shower_start_max_layer = cms.int32(5),
+        shower_start_max_layer = cms.int32(9999),
         siblings_maxRSquared = cms.vdouble(0.0006, 0.0006, 0.0006),
-        skip_layers = cms.int32(2),
+        skip_layers = cms.int32(0),
         type = cms.string('CA')
     ),
     pluginPatternRecognitionByCLUE3D = cms.PSet(
         algo_verbosity = cms.int32(0),
-        criticalDensity = cms.double(4),
-        criticalEtaPhiDistance = cms.double(0.035),
+        criticalDensity = cms.double(0.6),
+        criticalEtaPhiDistance = cms.double(0.025),
+        criticalSelfDensity = cms.double(0.15),
+        criticalXYDistance = cms.double(1.8),
+        criticalZDistanceLyr = cms.int32(5),
         densityEtaPhiDistanceSqr = cms.double(0.0008),
         densityOnSameLayer = cms.bool(False),
         densitySiblingLayers = cms.int32(3),
+        densityXYDistanceSqr = cms.double(3.24),
         eid_input_name = cms.string('input'),
         eid_min_cluster_energy = cms.double(1),
         eid_n_clusters = cms.int32(10),
         eid_n_layers = cms.int32(50),
         eid_output_name_energy = cms.string('output/regressed_energy'),
         eid_output_name_id = cms.string('output/id_probabilities'),
-        minNumLayerCluster = cms.int32(5),
+        kernelDensityFactor = cms.double(0.2),
+        minNumLayerCluster = cms.int32(2),
+        nearestHigherOnSameLayer = cms.bool(False),
         outlierMultiplier = cms.double(2),
-        type = cms.string('CLUE3D')
+        rescaleDensityByZ = cms.bool(False),
+        type = cms.string('CLUE3D'),
+        useAbsoluteProjectiveScale = cms.bool(True),
+        useClusterDimensionXY = cms.bool(False)
     ),
     pluginPatternRecognitionByFastJet = cms.PSet(
         algo_verbosity = cms.int32(0),
@@ -68,5 +77,6 @@
         type = cms.string('FastJet')
     ),
     seeding_regions = cms.InputTag("ticlSeedingL1"),
+    tfDnnLabel = cms.string('tracksterSelectionTf'),
     time_layerclusters = cms.InputTag("hgcalLayerClustersL1Seeded","timeLayerCluster")
 )

HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersHADForEgamma_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHigh_cfi.py

@@ -1,15 +1,15 @@
 import FWCore.ParameterSet.Config as cms
 
-ticlTrackstersHADForEgamma = cms.EDProducer("TrackstersProducer",
+ticlTrackstersCLUE3DHigh = cms.EDProducer("TrackstersProducer",
     detector = cms.string('HGCAL'),
-    filtered_mask = cms.InputTag("filteredLayerClustersHADForEgamma","HAD"),
-    itername = cms.string('HAD'),
+    filtered_mask = cms.InputTag("filteredLayerClustersCLUE3DHigh","CLUE3DHigh"),
+    itername = cms.string('CLUE3DHigh'),
     layer_clusters = cms.InputTag("hgcalLayerClusters"),
     layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"),
     layer_clusters_tiles = cms.InputTag("ticlLayerTileProducer"),
     mightGet = cms.optional.untracked.vstring,
-    original_mask = cms.InputTag("ticlTrackstersTrk"),
-    patternRecognitionBy = cms.string('CA'),
+    original_mask = cms.InputTag("hgcalLayerClusters","InitialLayerClustersMask"),
+    patternRecognitionBy = cms.string('CLUE3D'),
     pluginPatternRecognitionByCA = cms.PSet(
         algo_verbosity = cms.int32(0),
         eid_input_name = cms.string('input'),
@@ -21,39 +21,48 @@
         energy_em_over_total_threshold = cms.double(-1),
         etaLimitIncreaseWindow = cms.double(2.1),
         filter_on_categories = cms.vint32(0),
-        max_delta_time = cms.double(-1),
+        max_delta_time = cms.double(3),
         max_longitudinal_sigmaPCA = cms.double(9999),
         max_missing_layers_in_trackster = cms.int32(9999),
         max_out_in_hops = cms.int32(10),
-        min_cos_pointing = cms.double(0.819),
-        min_cos_theta = cms.double(0.866),
-        min_layers_per_trackster = cms.int32(12),
+        min_cos_pointing = cms.double(-1),
+        min_cos_theta = cms.double(0.915),
+        min_layers_per_trackster = cms.int32(10),
         oneTracksterPerTrackSeed = cms.bool(False),
         out_in_dfs = cms.bool(True),
         pid_threshold = cms.double(0),
         promoteEmptyRegionToTrackster = cms.bool(False),
         root_doublet_max_distance_from_seed_squared = cms.double(9999),
         shower_start_max_layer = cms.int32(9999),
         siblings_maxRSquared = cms.vdouble(0.0006, 0.0006, 0.0006),
-        skip_layers = cms.int32(1),
+        skip_layers = cms.int32(0),
         type = cms.string('CA')
     ),
     pluginPatternRecognitionByCLUE3D = cms.PSet(
         algo_verbosity = cms.int32(0),
-        criticalDensity = cms.double(4),
-        criticalEtaPhiDistance = cms.double(0.035),
+        criticalDensity = cms.double(0.6),
+        criticalEtaPhiDistance = cms.double(0.025),
+        criticalSelfDensity = cms.double(0.15),
+        criticalXYDistance = cms.double(1.8),
+        criticalZDistanceLyr = cms.int32(5),
         densityEtaPhiDistanceSqr = cms.double(0.0008),
         densityOnSameLayer = cms.bool(False),
         densitySiblingLayers = cms.int32(3),
+        densityXYDistanceSqr = cms.double(3.24),
         eid_input_name = cms.string('input'),
         eid_min_cluster_energy = cms.double(1),
         eid_n_clusters = cms.int32(10),
         eid_n_layers = cms.int32(50),
         eid_output_name_energy = cms.string('output/regressed_energy'),
         eid_output_name_id = cms.string('output/id_probabilities'),
-        minNumLayerCluster = cms.int32(5),
+        kernelDensityFactor = cms.double(0.2),
+        minNumLayerCluster = cms.int32(2),
+        nearestHigherOnSameLayer = cms.bool(False),
         outlierMultiplier = cms.double(2),
-        type = cms.string('CLUE3D')
+        rescaleDensityByZ = cms.bool(False),
+        type = cms.string('CLUE3D'),
+        useAbsoluteProjectiveScale = cms.bool(True),
+        useClusterDimensionXY = cms.bool(False)
     ),
     pluginPatternRecognitionByFastJet = cms.PSet(
         algo_verbosity = cms.int32(0),
@@ -68,6 +77,6 @@
         type = cms.string('FastJet')
     ),
     seeding_regions = cms.InputTag("ticlSeedingGlobal"),
+    tfDnnLabel = cms.string('tracksterSelectionTf'),
     time_layerclusters = cms.InputTag("hgcalLayerClusters","timeLayerCluster")
 )
-

HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaL1SeededTask_cfi.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from ..modules.filteredLayerClustersEML1Seeded_cfi import *
+from ..modules.filteredLayerClustersCLUE3DHighL1Seeded_cfi import *
 from ..modules.hgcalDigis_cfi import *
 from ..modules.hgcalDigisL1Seeded_cfi import *
 from ..modules.hgcalLayerClustersL1Seeded_cfi import *
@@ -14,12 +14,12 @@
 from ..modules.particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi import *
 from ..modules.ticlLayerTileProducerL1Seeded_cfi import *
 from ..modules.ticlSeedingL1_cfi import *
-from ..modules.ticlTrackstersEML1_cfi import *
+from ..modules.ticlTrackstersCLUE3DHighL1Seeded_cfi import *
 
 HLTHgcalTiclPFClusteringForEgammaL1SeededTask = cms.Task(
     HGCalRecHitL1Seeded,
     HGCalUncalibRecHitL1Seeded,
-    filteredLayerClustersEML1Seeded,
+    filteredLayerClustersCLUE3DHighL1Seeded,
     hgcalDigis,
     hgcalDigisL1Seeded,
     hgcalLayerClustersL1Seeded,
@@ -31,5 +31,5 @@
     particleFlowSuperClusterHGCalFromTICLL1Seeded,
     ticlLayerTileProducerL1Seeded,
     ticlSeedingL1,
-    ticlTrackstersEML1
+    ticlTrackstersCLUE3DHighL1Seeded
 )