diff --git a/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py b/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py index 77b647e6ce291..7e0076bb947bb 100644 --- a/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py +++ b/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py @@ -22,8 +22,10 @@ 'keep *_ticlTrackstersTrk_*_*', 'keep *_ticlTrackstersMIP_*_*', 'keep *_ticlTrackstersMerge_*_*', + 'keep *_ticlTrackstersHFNoseTrkEM_*_*', 'keep *_ticlTrackstersHFNoseEM_*_*', 'keep *_ticlTrackstersHFNoseMIP_*_*', + 'keep *_ticlTrackstersHFNoseHAD_*_*', 'keep *_ticlTrackstersHFNoseMerge_*_*', 'keep *_pfTICL_*_*' ) diff --git a/RecoHGCal/TICL/python/HADStep_cff.py b/RecoHGCal/TICL/python/HADStep_cff.py index 72efaebc201ec..c69aee139b352 100644 --- a/RecoHGCal/TICL/python/HADStep_cff.py +++ b/RecoHGCal/TICL/python/HADStep_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from RecoHGCal.TICL.TICLSeedingRegions_cff import ticlSeedingGlobal +from RecoHGCal.TICL.TICLSeedingRegions_cff import ticlSeedingGlobal, ticlSeedingGlobalHFNose, ticlSeedingForHFHFNose from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer as _ticlLayerTileProducer from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer @@ -44,3 +44,33 @@ ,ticlTrackstersHAD ,ticlMultiClustersFromTrackstersHAD) +filteredLayerClustersHFNoseHAD = _filteredLayerClustersProducer.clone( + min_cluster_size = 2, # inclusive + algo_number = 9, + iteration_label = "HADn", + LayerClusters = 'hgcalLayerClustersHFNose', + LayerClustersInputMask = "hgcalLayerClustersHFNose:InitialLayerClustersMask" +) + +ticlTrackstersHFNoseHAD = _trackstersProducer.clone( + detector = "HFNose", + layer_clusters = "hgcalLayerClustersHFNose", + layer_clusters_hfnose_tiles = "ticlLayerTileHFNose", + original_mask = "hgcalLayerClustersHFNose:InitialLayerClustersMask", + filtered_mask = "filteredLayerClustersHFNoseHAD:HADn", + seeding_regions = "ticlSeedingGlobalHFNose", + time_layerclusters = "hgcalLayerClustersHFNose:timeLayerCluster", + # For the moment we mask everything w/o requirements since we are last + pid_threshold = 0., + skip_layers = 1, + min_layers_per_trackster = 5, + min_cos_theta = 0.866, # ~30 degrees + min_cos_pointing = 0.819, # ~35 degrees + max_delta_time = -1, + itername = "HADRONIC" + ) + +ticlHFNoseHADStepTask = cms.Task(ticlSeedingGlobalHFNose + ,filteredLayerClustersHFNoseHAD + ,ticlTrackstersHFNoseHAD + ,ticlSeedingForHFHFNose) diff --git a/RecoHGCal/TICL/python/TrkEMStep_cff.py b/RecoHGCal/TICL/python/TrkEMStep_cff.py index ec0e995b5357f..826e194f6f7ff 100644 --- a/RecoHGCal/TICL/python/TrkEMStep_cff.py +++ b/RecoHGCal/TICL/python/TrkEMStep_cff.py @@ -18,7 +18,7 @@ # CA - PATTERN RECOGNITION ticlTrackstersTrkEM = _trackstersProducer.clone( - filtered_mask = cms.InputTag("filteredLayerClustersTrkEM", "TrkEM"), + filtered_mask = "filteredLayerClustersTrkEM:TrkEM", seeding_regions = "ticlSeedingTrk", filter_on_categories = [0, 1], pid_threshold = 0.5, @@ -51,7 +51,7 @@ filteredLayerClustersHFNoseTrkEM = filteredLayerClustersTrkEM.clone( LayerClusters = 'hgcalLayerClustersHFNose', - LayerClustersInputMask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"), + LayerClustersInputMask = "hgcalLayerClustersHFNose:InitialLayerClustersMask", min_cluster_size = 2, # inclusive algo_number = 9, iteration_label = "TrkEMn" @@ -61,8 +61,8 @@ detector = "HFNose", layer_clusters = "hgcalLayerClustersHFNose", layer_clusters_hfnose_tiles = "ticlLayerTileHFNose", - original_mask = cms.InputTag("hgcalLayerClustersHFNose","InitialLayerClustersMask"), - filtered_mask = cms.InputTag("filteredLayerClustersHFNoseTrkEM", "TrkEMn"), + original_mask = "hgcalLayerClustersHFNose:InitialLayerClustersMask", + filtered_mask = "filteredLayerClustersHFNoseTrkEM:TrkEMn", seeding_regions = "ticlSeedingTrkHFNose", time_layerclusters = "hgcalLayerClustersHFNose:timeLayerCluster", itername = "TrkEMn", diff --git a/RecoHGCal/TICL/python/iterativeTICL_cff.py b/RecoHGCal/TICL/python/iterativeTICL_cff.py index dc44121abda7f..353ff8ccd5008 100644 --- a/RecoHGCal/TICL/python/iterativeTICL_cff.py +++ b/RecoHGCal/TICL/python/iterativeTICL_cff.py @@ -40,6 +40,7 @@ iterHFNoseTICLTask = cms.Task(ticlLayerTileHFNoseTask ,ticlHFNoseTrkEMStepTask ,ticlHFNoseEMStepTask + ,ticlHFNoseHADStepTask ,ticlHFNoseMIPStepTask )