diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py index 829a06467ad5b..607dd22c8ed1e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py @@ -53,7 +53,7 @@ type = cms.string('SiCLUE') ), - detector = cms.string('all'), + detector = cms.string('EE'), recHits = cms.InputTag('hltRechitInRegionsHGCAL', 'HGCEERecHits'), timeClname = cms.string('timeLayerCluster'), nHitsTime = cms.uint32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py index e8d4b1303f2ae..e02055507c030 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py @@ -53,7 +53,7 @@ type = cms.string('SiCLUE') ), - detector = cms.string('all'), + detector = cms.string('EE'), recHits = cms.InputTag('HGCalRecHit', 'HGCEERecHits'), timeClname = cms.string('timeLayerCluster'), nHitsTime = cms.uint32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py index 9ca52562c3720..4628c1fd1ce90 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py @@ -1,9 +1,61 @@ import FWCore.ParameterSet.Config as cms -import hgcalLayerClustersEEL1Seeded - -hgcalLayerClustersHSciL1Seeded = hgcalLayerClustersEEL1Seeded.clone( +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'), - plugin = hgcalLayerClustersEEL1Seeded.plugin.clone(type = cms.string('SciCLUE')) - + timeClname = cms.string('timeLayerCluster'), + nHitsTime = cms.uint32(3), + mightGet = cms.optional.untracked.vstring ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py index 8f64d0263f847..5ebfc16da99ef 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py @@ -1,9 +1,62 @@ import FWCore.ParameterSet.Config as cms -import hgcalLayerClustersEE - -hgcalLayerClustersHSci = hgcalLayerClustersEE.clone( +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'), - plugin = hgcalLayerClustersEE.plugin.clone(type = cms.string('SciCLUE')) + timeClname = cms.string('timeLayerCluster'), + nHitsTime = cms.uint32(3), + mightGet = cms.optional.untracked.vstring ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py index 2c0d01f173d28..b655894c67165 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py @@ -1,7 +1,61 @@ import FWCore.ParameterSet.Config as cms -import hgcalLayerClustersEEL1Seeded - -hgcalLayerClustersHSiL1Seeded = hgcalLayerClustersEEL1Seeded.clone( - recHits = cms.InputTag('HGCalRecHit', 'HGCHEFRecHits') +hgcalLayerClustersHSiL1Seeded = 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('FH'), + recHits = cms.InputTag('hltRechitInRegionsHGCAL', 'HGCHEFRecHits'), + timeClname = cms.string('timeLayerCluster'), + nHitsTime = cms.uint32(3), + mightGet = cms.optional.untracked.vstring ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py index a8d4adca9efc5..e409ad50d7065 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py @@ -1,7 +1,63 @@ import FWCore.ParameterSet.Config as cms -import hgcalLayerClustersEE - -hgcalLayerClustersHSi = hgcalLayerClustersEE.clone( - recHits = cms.InputTag('HGCalRecHit', 'HGCHEFRecHits') +hgcalLayerClustersHSi = 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('FH'), + recHits = cms.InputTag('HGCalRecHit', 'HGCHEFRecHits'), + timeClname = cms.string('timeLayerCluster'), + nHitsTime = cms.uint32(3), + mightGet = cms.optional.untracked.vstring ) + + diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py new file mode 100644 index 0000000000000..89e12007dc55c --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py @@ -0,0 +1,12 @@ +import FWCore.ParameterSet.Config as cms + +hgcalMergeLayerClustersL1Seeded = cms.EDProducer('MergeClusterProducer', + layerClustersEE = cms.InputTag('hgcalLayerClustersEEL1Seeded'), + layerClustersHSi = cms.InputTag('hgcalLayerClustersHSiL1Seeded'), + layerClustersHSci = cms.InputTag('hgcalLayerClustersHSciL1Seeded'), + time_layerclustersEE = cms.InputTag('hgcalLayerClustersEEL1Seeded', 'timeLayerCluster'), + time_layerclustersHSi = cms.InputTag('hgcalLayerClustersHSiL1Seeded', 'timeLayerCluster'), + time_layerclustersHSci = cms.InputTag('hgcalLayerClustersHSciL1Seeded', 'timeLayerCluster'), + timeClname = cms.string('timeLayerCluster'), + mightGet = cms.optional.untracked.vstring +) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py index 1ffb4824f26eb..32d4323ff9415 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py @@ -126,7 +126,7 @@ from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import hgcalMergeLayerClusters +from ..modules.hgcalMergeLayerClusters_cfi import * HLT_IsoMu24_FromL1TkMuon = cms.Path( HLTBeginSequence + diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaL1SeededTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaL1SeededTask_cfi.py index e50d86c3b80ac..ab4d1fb0c0c7b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaL1SeededTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaL1SeededTask_cfi.py @@ -8,6 +8,7 @@ from ..modules.hgcalLayerClustersEEL1Seeded_cfi import * from ..modules.hgcalLayerClustersHSiL1Seeded_cfi import * from ..modules.hgcalLayerClustersHSciL1Seeded_cfi import * +from ..modules.hgcalMergeLayerClustersL1Seeded_cfi import * from ..modules.hltL1TEGammaHGCFilteredCollectionProducer_cfi import * from ..modules.hltRechitInRegionsHGCAL_cfi import * from ..modules.particleFlowClusterHGCalFromTICLL1Seeded_cfi import * @@ -16,10 +17,8 @@ from ..modules.ticlLayerTileProducerL1Seeded_cfi import * from ..modules.ticlSeedingL1_cfi import * from ..modules.ticlTrackstersCLUE3DHighL1Seeded_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import hgcalMergeLayerClusters from ..tasks.HLTBeamSpotTask_cfi import * -hgcalMergeLayerClustersL1Seeded = hgcalMergeLayerClusters.clone() HLTHgcalTiclPFClusteringForEgammaL1SeededTask = cms.Task( HGCalRecHitL1Seeded, @@ -28,6 +27,9 @@ filteredLayerClustersCLUE3DHighL1Seeded, hgcalDigis, hgcalDigisL1Seeded, + hgcalLayerClustersEEL1Seeded, + hgcalLayerClustersHSciL1Seeded, + hgcalLayerClustersHSiL1Seeded, hgcalMergeLayerClustersL1Seeded, hltL1TEGammaHGCFilteredCollectionProducer, hltRechitInRegionsHGCAL, diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaUnseededTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaUnseededTask_cfi.py index b914ad2141b07..5c294eff8b153 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaUnseededTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTHgcalTiclPFClusteringForEgammaUnseededTask_cfi.py @@ -13,7 +13,7 @@ from ..modules.ticlLayerTileProducer_cfi import * from ..modules.ticlSeedingGlobal_cfi import * from ..modules.ticlTrackstersCLUE3DHigh_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import hgcalMergeLayerClusters +from ..modules.hgcalMergeLayerClusters_cfi import * from ..tasks.HLTBeamSpotTask_cfi import * HLTHgcalTiclPFClusteringForEgammaUnseededTask = cms.Task(