more fixes, working version in C26

Author: waredjeb

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

@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 hltHGCalUncalibRecHitL1Seeded = cms.EDProducer("HGCalUncalibRecHitProducer",
     HGCEEConfig = cms.PSet(
@@ -60,3 +61,21 @@
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
 ticl_v5.toModify(hltHGCalUncalibRecHitL1Seeded, computeLocalTime = cms.bool(True))
+
+_modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCEEConfig.clone(
+    fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4])
+)
+_modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHEFConfig.clone(
+    fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8])
+)
+_modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHFNoseConfig.clone(
+    fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57)
+)
+
+phase2_hgcalV19.toModify(
+    hltHGCalUncalibRecHitL1Seeded,
+    HGCEEConfig = _modifiedHGCEEConfig_v19,
+    HGCHEFConfig = _modifiedHGCHEFConfig_v19,
+    HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19
+)
+

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

@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 
 hltHGCalUncalibRecHit = cms.EDProducer("HGCalUncalibRecHitProducer",
@@ -61,3 +62,22 @@
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
 ticl_v5.toModify(hltHGCalUncalibRecHit, computeLocalTime = cms.bool(True))
+
+
+_modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHit.HGCEEConfig.clone(
+    fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4])
+)
+_modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHit.HGCHEFConfig.clone(
+    fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8])
+)
+_modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHit.HGCHFNoseConfig.clone(
+    fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57)
+)
+
+phase2_hgcalV19.toModify(
+    hltHGCalUncalibRecHit,
+    HGCEEConfig = _modifiedHGCEEConfig_v19,
+    HGCHEFConfig = _modifiedHGCHEFConfig_v19,
+    HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19
+)
+

HLTrigger/Configuration/python/HLT_75e33/psets/hgcal_reco_constants_cfi.py

@@ -56,6 +56,7 @@
                                  2000.0, 2400.
                              ),
                          numberOfThicknesses = cms.uint32(4),
-                         maxNumberOfThickIndices = cms.uint32(8)
+                         maxNumberOfThickIndices = cms.uint32(8),
+                         thresholdW0 = cms.vdouble(2.9, 2.9, 2.9, 2.9),
                          )
 

RecoLocalCalo/HGCalRecProducers/python/HGCalRecHit_cfi.py

@@ -3,6 +3,7 @@
 from RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi import *
 
 from Configuration.Eras.Modifier_phase2_hgcalV16_cff import phase2_hgcalV16
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 # There is no layer zero, while no average is taken for the last layer
 dummy_weight = 0.0
@@ -212,3 +213,7 @@ def calcWeights(weightsPerLayer): res = [sum(wei)/2. for wei in zip(weightsPerLa
                          sciThicknessCorrection =  0.69,
                          layerWeights = dEdX_v16.weights) 
 
+phase2_hgcalV19.toModify(HGCalRecHit, 
+                         thicknessCorrection = [0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85] , 
+                         sciThicknessCorrection =  0.69,
+                         layerWeights = dEdX_v16.weights) 

SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py

@@ -53,6 +53,8 @@
 HGCAL_noises = cms.PSet(
     values = cms.vdouble([x for x in nonAgedNoises])
     )
+phase2_hgcalV19.toModify(HGCAL_noises, values = [x for x in nonAgedNoises_v9_v19])
+phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = nonAgedCCEs_v19)
 
 # ECAL
 hgceeDigitizer = cms.PSet(
@@ -401,8 +403,6 @@ def HGCal_disableNoise(process):
 
 phase2_hgcalV19.toModify(HGCAL_noise_fC, values = [x*fC_per_ele for x in nonAgedNoises_v9_v19])
 phase2_hgcalV19.toModify(HFNose_noise_fC, values = [x*fC_per_ele for x in nonAgedNoises_v9_v19])
-phase2_hgcalV19.toModify(HGCAL_noises, values = [x for x in nonAgedNoises_v9_v19])
-phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = nonAgedCCEs_v19)
 
 def HFNose_setEndOfLifeNoise(process,byDose=True,byDoseAlgo=0,byDoseFactor=1):
     """includes all effects from radiation and gain choice"""