Skip to content

Commit

Permalink
Merge pull request #44552 from felicepantaleo/hgcalHLTfix
Browse files Browse the repository at this point in the history
HLT phase-2: fix HGCAL Layercluster and create common constants configuration for HGCAL
  • Loading branch information
cmsbuild authored Mar 31, 2024
2 parents a7f9a4b + abbd14d commit 4a6e02f
Show file tree
Hide file tree
Showing 11 changed files with 160 additions and 270 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants


HGCalRecHitL1Seeded = cms.EDProducer("HGCalRecHitProducer",
HGCEE_cce = cms.PSet(
Expand Down Expand Up @@ -48,28 +50,13 @@
0.0, 39.500245, 39.756638, 39.756638, 39.756638,
39.756638, 66.020266, 92.283895, 92.283895
),
layerWeights = 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
),
layerWeights = HGCAL_reco_constants.dEdXweights,
maxValSiPar = cms.double(10000.0),
minValSiPar = cms.double(10.0),
noiseSiPar = cms.double(5.5),
rangeMask = cms.uint32(4294442496),
rangeMatch = cms.uint32(1161838592),
sciThicknessCorrection = cms.double(0.9),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = HGCAL_reco_constants.sciThicknessCorrection,
thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
thicknessNoseCorrection = cms.vdouble(1.132, 1.092, 1.084)
)
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants

HGCalRecHit = cms.EDProducer("HGCalRecHitProducer",
HGCEE_cce = cms.PSet(
refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies')
),
HGCEE_fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
HGCEE_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:3]),
HGCEE_isSiFE = cms.bool(True),
HGCEE_keV2DIGI = cms.double(0.044259),
HGCEE_noise_fC = cms.PSet(
Expand All @@ -22,7 +23,7 @@
HGCHEF_cce = cms.PSet(
refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies')
),
HGCHEF_fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
HGCHEF_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[3:6]),
HGCHEF_isSiFE = cms.bool(True),
HGCHEF_keV2DIGI = cms.double(0.044259),
HGCHEF_noise_fC = cms.PSet(
Expand All @@ -48,28 +49,13 @@
0.0, 39.500245, 39.756638, 39.756638, 39.756638,
39.756638, 66.020266, 92.283895, 92.283895
),
layerWeights = 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
),
layerWeights = HGCAL_reco_constants.dEdXweights,
maxValSiPar = cms.double(10000.0),
minValSiPar = cms.double(10.0),
noiseSiPar = cms.double(5.5),
rangeMask = cms.uint32(4294442496),
rangeMatch = cms.uint32(1161838592),
sciThicknessCorrection = cms.double(0.9),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
sciThicknessCorrection = HGCAL_reco_constants.sciThicknessCorrection,
thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
thicknessNoseCorrection = cms.vdouble(1.132, 1.092, 1.084)
)
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants

HGCalUncalibRecHitL1Seeded = cms.EDProducer("HGCalUncalibRecHitProducer",
HGCEEConfig = cms.PSet(
adcNbits = cms.uint32(10),
adcSaturation = cms.double(100),
fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:3]),
isSiFE = cms.bool(True),
tdcNbits = cms.uint32(12),
tdcOnset = cms.double(60),
Expand All @@ -30,7 +31,7 @@
HGCHEFConfig = cms.PSet(
adcNbits = cms.uint32(10),
adcSaturation = cms.double(100),
fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[3:6]),
isSiFE = cms.bool(True),
tdcNbits = cms.uint32(12),
tdcOnset = cms.double(60),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants


HGCalUncalibRecHit = cms.EDProducer("HGCalUncalibRecHitProducer",
HGCEEConfig = cms.PSet(
adcNbits = cms.uint32(10),
adcSaturation = cms.double(100),
fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:3]),
isSiFE = cms.bool(True),
tdcNbits = cms.uint32(12),
tdcOnset = cms.double(60),
Expand All @@ -30,7 +32,7 @@
HGCHEFConfig = cms.PSet(
adcNbits = cms.uint32(10),
adcSaturation = cms.double(100),
fCPerMIP = cms.vdouble(2.06, 3.43, 5.15),
fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[3:6]),
isSiFE = cms.bool(True),
tdcNbits = cms.uint32(12),
tdcOnset = cms.double(60),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,36 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants

hgcalLayerClustersEEL1Seeded = cms.EDProducer("HGCalLayerClusterProducer",
detector = cms.string('EE'),
mightGet = cms.optional.untracked.vstring,
nHitsTime = cms.uint32(3),
plugin = cms.PSet(
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
dEdXweights = HGCAL_reco_constants.dEdXweights,
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
deltac = cms.vdouble(1.3, 1.3, 1.3, 0.0315),
deltasi_index_regemfac = cms.int32(3),
dependSensor = cms.bool(True),
ecut = cms.double(3),
fcPerEle = cms.double(0),
fcPerMip = cms.vdouble(
2.06, 3.43, 5.15, 2.06, 3.43,
5.15
),
fcPerEle = HGCAL_reco_constants.fcPerEle,
fcPerMip = HGCAL_reco_constants.fcPerMip,
kappa = cms.double(9),
maxNumberOfThickIndices = cms.uint32(6),
noiseMip = cms.PSet(
noise_MIP = cms.double(0.01),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1)
),
noises = cms.vdouble(
2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0
),
positionDeltaRho2 = cms.double(1.69),
sciThicknessCorrection = cms.double(0.9),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
thresholdW0 = cms.vdouble(2.9, 2.9, 2.9),
maxNumberOfThickIndices = HGCAL_reco_constants.maxNumberOfThickIndices,
noiseMip = HGCAL_reco_constants.noiseMip,
noises = HGCAL_reco_constants.noises,
positionDeltaRho2 = HGCAL_reco_constants.positionDeltaRho2,
sciThicknessCorrection = HGCAL_reco_constants.sciThicknessCorrection,
thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
thresholdW0 = HGCAL_reco_constants.thresholdW0,
type = cms.string('SiCLUE'),
use2x2 = cms.bool(True),
verbosity = cms.untracked.uint32(3)
),
recHits = cms.InputTag("hltRechitInRegionsHGCAL","HGCEERecHits"),
timeClname = cms.string('timeLayerCluster')
)

Original file line number Diff line number Diff line change
@@ -1,53 +1,31 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants

hgcalLayerClustersEE = cms.EDProducer("HGCalLayerClusterProducer",
detector = cms.string('EE'),
mightGet = cms.optional.untracked.vstring,
nHitsTime = cms.uint32(3),
plugin = cms.PSet(
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
dEdXweights = HGCAL_reco_constants.dEdXweights,
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
deltac = cms.vdouble(1.3, 1.3, 1.3, 0.0315),
deltasi_index_regemfac = cms.int32(3),
dependSensor = cms.bool(True),
ecut = cms.double(3),
fcPerEle = cms.double(0),
fcPerMip = cms.vdouble(
2.06, 3.43, 5.15, 2.06, 3.43,
5.15
),
fcPerEle = HGCAL_reco_constants.fcPerEle,
fcPerMip = HGCAL_reco_constants.fcPerMip,
kappa = cms.double(9),
maxNumberOfThickIndices = cms.uint32(6),
noiseMip = cms.PSet(
noise_MIP = cms.double(0.01),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1)
),
noises = cms.vdouble(
2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0
),
positionDeltaRho2 = cms.double(1.69),
sciThicknessCorrection = cms.double(0.9),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
thresholdW0 = cms.vdouble(2.9, 2.9, 2.9),
maxNumberOfThickIndices = HGCAL_reco_constants.maxNumberOfThickIndices,
noiseMip = HGCAL_reco_constants.noiseMip,
noises = HGCAL_reco_constants.noises,
positionDeltaRho2 = HGCAL_reco_constants.positionDeltaRho2,
sciThicknessCorrection = HGCAL_reco_constants.sciThicknessCorrection,
thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
thresholdW0 = HGCAL_reco_constants.thresholdW0,
type = cms.string('SiCLUE'),
use2x2 = cms.bool(True),
verbosity = cms.untracked.uint32(3)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,36 @@
import FWCore.ParameterSet.Config as cms
from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants

hgcalLayerClustersHSciL1Seeded = cms.EDProducer("HGCalLayerClusterProducer",
detector = cms.string('BH'),
mightGet = cms.optional.untracked.vstring,
nHitsTime = cms.uint32(3),
plugin = cms.PSet(
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
dEdXweights = HGCAL_reco_constants.dEdXweights,
deltac = cms.vdouble(
1.3,
1.3,
1.3,
0.0315
),
deltac = cms.vdouble(1.3, 1.3, 1.3, 0.0315),
deltasi_index_regemfac = cms.int32(3),
dependSensor = cms.bool(True),
ecut = cms.double(3),
fcPerEle = cms.double(0),
fcPerMip = cms.vdouble(
2.06, 3.43, 5.15, 2.06, 3.43,
5.15
),
fcPerEle = HGCAL_reco_constants.fcPerEle,
fcPerMip = HGCAL_reco_constants.fcPerMip,
kappa = cms.double(9),
maxNumberOfThickIndices = cms.uint32(6),
noiseMip = cms.PSet(
noise_MIP = cms.double(0.01),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1),
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1)
),
noises = cms.vdouble(
2000.0, 2400.0, 2000.0, 2000.0, 2400.0,
2000.0
),
positionDeltaRho2 = cms.double(1.69),
sciThicknessCorrection = cms.double(0.9),
thicknessCorrection = cms.vdouble(
0.77, 0.77, 0.77, 0.84, 0.84,
0.84
),
thresholdW0 = cms.vdouble(2.9, 2.9, 2.9),
maxNumberOfThickIndices = HGCAL_reco_constants.maxNumberOfThickIndices,
noiseMip = HGCAL_reco_constants.noiseMip,
noises = HGCAL_reco_constants.noises,
positionDeltaRho2 = HGCAL_reco_constants.positionDeltaRho2,
sciThicknessCorrection = HGCAL_reco_constants.sciThicknessCorrection,
thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
thresholdW0 = HGCAL_reco_constants.thresholdW0,
type = cms.string('SciCLUE'),
use2x2 = cms.bool(True),
verbosity = cms.untracked.uint32(3)
),
recHits = cms.InputTag("hltRechitInRegionsHGCAL","HGCHEBRecHits"),
timeClname = cms.string('timeLayerCluster')
)

Loading

0 comments on commit 4a6e02f

Please sign in to comment.