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

Split HGCal layer cluster producer #41589

Merged
merged 20 commits into from
Jun 1, 2023
Merged

Split HGCal layer cluster producer #41589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
668d91c
Change producer to accept only one collection of RecHits
OlivieFranklova Mar 15, 2023
e42a4d5
Remove doSharing
OlivieFranklova Mar 15, 2023
44ffacb
Add mergeClustersProducer
OlivieFranklova Mar 17, 2023
07f64b9
Change configuration and referances to HgcalLayerCluster
OlivieFranklova Mar 20, 2023
22c107e
Remove density from producer
OlivieFranklova Mar 24, 2023
4c5e12a
Change filtering by algo_id
OlivieFranklova Mar 27, 2023
dd85cdc
Rename HgcalClusterFilterMask to TICLClusterFilterMask
Mar 28, 2023
f7c98c0
Template layer tiles, split Si and Sci CLUE
OlivieFranklova Apr 13, 2023
292b8bd
Move computePosition to HGCalLayerClusterProducer
OlivieFranklova Apr 17, 2023
bfd7267
Change Silicon branching
OlivieFranklova Apr 25, 2023
4427058
Move distance to HGCalLayerTiles
OlivieFranklova Apr 27, 2023
3782a2c
Clean code
OlivieFranklova Apr 21, 2023
835ec0b
Fix conflicts
OlivieFranklova Apr 28, 2023
eeb3ea1
Final editing
OlivieFranklova May 2, 2023
2be8929
Format code
OlivieFranklova May 3, 2023
83e14a8
fix
OlivieFranklova May 9, 2023
d24a43e
fix
OlivieFranklova May 9, 2023
d180d2e
fix
OlivieFranklova May 9, 2023
12bda70
Fix
OlivieFranklova May 11, 2023
651e4d6
Fix
OlivieFranklova May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DataFormats/CaloRecHit/interface/CaloCluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ namespace reco {
particleFlow = 5,
hgcal_em = 6,
hgcal_had = 7,
hgcal_mixed = 8,
hfnose = 9,
undefined = 1000
};
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/HGCalReco/interface/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace ticl {
} // namespace ticl

namespace ticl {
typedef std::vector<std::pair<unsigned int, float> > HgcalClusterFilterMask;
typedef std::vector<std::pair<unsigned int, float> > TICLClusterFilterMask;
} // namespace ticl

#endif // DataFormats_HGCalReco_Common_h
3 changes: 2 additions & 1 deletion Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ void FWCaloClusterProxyBuilder::build(const reco::CaloCluster &iData,
continue;

// HGCal
if (iData.algo() == 8 || (type >= 8 && type <= 10)) {
if (iData.algo() == reco::CaloCluster::hgcal_em || iData.algo() == reco::CaloCluster::hgcal_had ||
(type >= 8 && type <= 10)) {
if (heatmap && hitmap->find(it->first) == hitmap->end())
continue;

Expand Down
5 changes: 2 additions & 3 deletions ...ger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHighL1Seeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersCLUE3DHighL1Seeded = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClustersL1Seeded"),
LayerClustersInputMask = cms.InputTag("hgcalLayerClustersL1Seeded","InitialLayerClustersMask"),
algo_number = cms.int32(8),
LayerClusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded"),
LayerClustersInputMask = cms.InputTag("hgcalMergeLayerClustersL1Seeded","InitialLayerClustersMask"),
clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
iteration_label = cms.string('CLUE3DHigh'),
max_cluster_size = cms.int32(9999),
Expand Down
5 changes: 2 additions & 3 deletions HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHigh_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersCLUE3DHigh = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClusters"),
LayerClustersInputMask = cms.InputTag("hgcalLayerClusters","InitialLayerClustersMask"),
algo_number = cms.int32(8),
LayerClusters = cms.InputTag("hgcalMergeLayerClusters"),
LayerClustersInputMask = cms.InputTag("hgcalMergeLayerClusters","InitialLayerClustersMask"),
clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
iteration_label = cms.string('CLUE3DHigh'),
max_cluster_size = cms.int32(9999),
Expand Down
3 changes: 1 addition & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersEM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersEM = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClusters"),
LayerClusters = cms.InputTag("hgcalMergeLayerClusters"),
LayerClustersInputMask = cms.InputTag("ticlTrackstersTrkEM"),
algo_number = cms.int32(8),
clusterFilter = cms.string('ClusterFilterByAlgoAndSizeAndLayerRange'),
iteration_label = cms.string('EM'),
max_cluster_size = cms.int32(9999),
Expand Down
3 changes: 1 addition & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersHAD_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersHAD = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClusters"),
LayerClusters = cms.InputTag("hgcalMergeLayerClusters"),
LayerClustersInputMask = cms.InputTag("ticlTrackstersTrk"),
algo_number = cms.int32(8),
clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
iteration_label = cms.string('HAD'),
max_cluster_size = cms.int32(9999),
Expand Down
5 changes: 2 additions & 3 deletions HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersTrkEM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersTrkEM = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClusters"),
LayerClustersInputMask = cms.InputTag("hgcalLayerClusters","InitialLayerClustersMask"),
algo_number = cms.int32(8),
LayerClusters = cms.InputTag("hgcalMergeLayerClusters"),
LayerClustersInputMask = cms.InputTag("hgcalMergeLayerClusters","InitialLayerClustersMask"),
clusterFilter = cms.string('ClusterFilterByAlgoAndSizeAndLayerRange'),
iteration_label = cms.string('TrkEM'),
max_cluster_size = cms.int32(9999),
Expand Down
3 changes: 1 addition & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersTrk_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import FWCore.ParameterSet.Config as cms

filteredLayerClustersTrk = cms.EDProducer("FilteredLayerClustersProducer",
LayerClusters = cms.InputTag("hgcalLayerClusters"),
LayerClusters = cms.InputTag("hgcalMergeLayerClusters"),
LayerClustersInputMask = cms.InputTag("ticlTrackstersEM"),
algo_number = cms.int32(8),
clusterFilter = cms.string('ClusterFilterByAlgoAndSize'),
iteration_label = cms.string('Trk'),
max_cluster_size = cms.int32(9999),
Expand Down
61 changes: 61 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py
View file
Open in desktop
rappoccio marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import FWCore.ParameterSet.Config as cms

hgcalLayerClustersEEL1Seeded = cms.EDProducer('HGCalLayerClusterProducer',
plugin = cms.PSet(
thresholdW0 = cms.vdouble(
2.9,
2.9,
2.9
),
positionDeltaRho2 = cms.double(1.69),
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
dependSensor = cms.bool(True),
ecut = cms.double(3),
kappa = cms.double(9),
verbosity = cms.untracked.uint32(3),
dEdXweights = cms.vdouble(
0.0, 8.894541, 10.937907, 10.937907, 10.937907,
10.937907, 10.937907, 10.937907, 10.937907, 10.937907,
10.932882, 10.932882, 10.937907, 10.937907, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 32.332097, 51.574301,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
69.513118, 87.582044, 87.582044, 87.582044, 87.582044,
87.582044, 87.214571, 86.888309, 86.92952, 86.92952,
86.92952),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = cms.double(0.9),
deltasi_index_regemfac = cms.int32(3),
maxNumberOfThickIndices = cms.uint32(6),
fcPerMip = cms.vdouble( 2.06, 3.43, 5.15, 2.06, 3.43, 5.15),
fcPerEle = cms.double(0),
noises = cms.vdouble( 2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0),
noiseMip = cms.PSet(
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
noise_MIP = cms.double(0.01)
),
use2x2 = cms.bool(True),
type = cms.string('SiCLUE')

),
detector = cms.string('EE'),
recHits = cms.InputTag('hltRechitInRegionsHGCAL', 'HGCEERecHits'),
timeClname = cms.string('timeLayerCluster'),
nHitsTime = cms.uint32(3),
mightGet = cms.optional.untracked.vstring
)
62 changes: 62 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import FWCore.ParameterSet.Config as cms

hgcalLayerClustersEE = cms.EDProducer('HGCalLayerClusterProducer',
plugin = cms.PSet(
thresholdW0 = cms.vdouble(
2.9,
2.9,
2.9
),
positionDeltaRho2 = cms.double(1.69),
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
dependSensor = cms.bool(True),
ecut = cms.double(3),
kappa = cms.double(9),
verbosity = cms.untracked.uint32(3),
dEdXweights = cms.vdouble(
0.0, 8.894541, 10.937907, 10.937907, 10.937907,
10.937907, 10.937907, 10.937907, 10.937907, 10.937907,
10.932882, 10.932882, 10.937907, 10.937907, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 32.332097, 51.574301,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
69.513118, 87.582044, 87.582044, 87.582044, 87.582044,
87.582044, 87.214571, 86.888309, 86.92952, 86.92952,
86.92952),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = cms.double(0.9),
deltasi_index_regemfac = cms.int32(3),
maxNumberOfThickIndices = cms.uint32(6),
fcPerMip = cms.vdouble( 2.06, 3.43, 5.15, 2.06, 3.43, 5.15),
fcPerEle = cms.double(0),
noises = cms.vdouble( 2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0),
noiseMip = cms.PSet(
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
noise_MIP = cms.double(0.01)
),
use2x2 = cms.bool(True),
type = cms.string('SiCLUE')

),
detector = cms.string('EE'),
recHits = cms.InputTag('HGCalRecHit', 'HGCEERecHits'),
timeClname = cms.string('timeLayerCluster'),
nHitsTime = cms.uint32(3),
mightGet = cms.optional.untracked.vstring
)

61 changes: 61 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import FWCore.ParameterSet.Config as cms

hgcalLayerClustersHSciL1Seeded = cms.EDProducer('HGCalLayerClusterProducer',
plugin = cms.PSet(
thresholdW0 = cms.vdouble(
2.9,
2.9,
2.9
),
positionDeltaRho2 = cms.double(1.69),
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
dependSensor = cms.bool(True),
ecut = cms.double(3),
kappa = cms.double(9),
verbosity = cms.untracked.uint32(3),
dEdXweights = cms.vdouble(
0.0, 8.894541, 10.937907, 10.937907, 10.937907,
10.937907, 10.937907, 10.937907, 10.937907, 10.937907,
10.932882, 10.932882, 10.937907, 10.937907, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 32.332097, 51.574301,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
69.513118, 87.582044, 87.582044, 87.582044, 87.582044,
87.582044, 87.214571, 86.888309, 86.92952, 86.92952,
86.92952),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = cms.double(0.9),
deltasi_index_regemfac = cms.int32(3),
maxNumberOfThickIndices = cms.uint32(6),
fcPerMip = cms.vdouble( 2.06, 3.43, 5.15, 2.06, 3.43, 5.15),
fcPerEle = cms.double(0),
noises = cms.vdouble( 2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0),
noiseMip = cms.PSet(
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
noise_MIP = cms.double(0.01)
),
use2x2 = cms.bool(True),
type = cms.string('SciCLUE')

),
detector = cms.string('BH'),
recHits = cms.InputTag('hltRechitInRegionsHGCAL', 'HGCHEBRecHits'),
timeClname = cms.string('timeLayerCluster'),
nHitsTime = cms.uint32(3),
mightGet = cms.optional.untracked.vstring
)
62 changes: 62 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import FWCore.ParameterSet.Config as cms

hgcalLayerClustersHSci = cms.EDProducer('HGCalLayerClusterProducer',
plugin = cms.PSet(
thresholdW0 = cms.vdouble(
2.9,
2.9,
2.9
),
positionDeltaRho2 = cms.double(1.69),
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
dependSensor = cms.bool(True),
ecut = cms.double(3),
kappa = cms.double(9),
verbosity = cms.untracked.uint32(3),
dEdXweights = cms.vdouble(
0.0, 8.894541, 10.937907, 10.937907, 10.937907,
10.937907, 10.937907, 10.937907, 10.937907, 10.937907,
10.932882, 10.932882, 10.937907, 10.937907, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 10.938169, 10.938169,
10.938169, 10.938169, 10.938169, 32.332097, 51.574301,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
51.444192, 51.444192, 51.444192, 51.444192, 51.444192,
69.513118, 87.582044, 87.582044, 87.582044, 87.582044,
87.582044, 87.214571, 86.888309, 86.92952, 86.92952,
86.92952),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = cms.double(0.9),
deltasi_index_regemfac = cms.int32(3),
maxNumberOfThickIndices = cms.uint32(6),
fcPerMip = cms.vdouble( 2.06, 3.43, 5.15, 2.06, 3.43, 5.15),
fcPerEle = cms.double(0),
noises = cms.vdouble( 2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0),
noiseMip = cms.PSet(
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
noise_MIP = cms.double(0.01)
),
use2x2 = cms.bool(True),
type = cms.string('SciCLUE')

),
detector = cms.string('BH'),
recHits = cms.InputTag('HGCalRecHit', 'HGCHEBRecHits'),
timeClname = cms.string('timeLayerCluster'),
nHitsTime = cms.uint32(3),
mightGet = cms.optional.untracked.vstring
)

Loading