fix more paramters through V19

waredjeb · waredjeb · commit c6eb4e4d2fe1 · 2025-07-28T10:07:43.000+02:00
diff --git a/HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_chargeCollectionEfficiencies_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_chargeCollectionEfficiencies_cfi.py
@@ -1,5 +1,8 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 HGCAL_chargeCollectionEfficiencies = cms.PSet(
     values = cms.vdouble(1.0, 1.0, 1.0)
-)
+)
+
+phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values =  cms.vdouble(1.0, 1.0,1.0,1.0))
diff --git a/HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_noise_fC_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_noise_fC_cfi.py
@@ -1,9 +1,12 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 HGCAL_noise_fC = cms.PSet(
     doseMap = cms.string(''),
     scaleByDose = cms.bool(False),
     scaleByDoseAlgo = cms.uint32(0),
     scaleByDoseFactor = cms.double(1),
     values = cms.vdouble(0.32041011999999996, 0.384492144, 0.32041011999999996)
-)
+)
+
+phase2_hgcalV19.toModify(HGCAL_noise_fC , values = cms.vdouble(0.32041011999999996, 0.384492144, 0.32041011999999996, 0.384492144))
diff --git a/HLTrigger/Configuration/python/HLT_75e33/psets/hgcal_reco_constants_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/psets/hgcal_reco_constants_cfi.py
@@ -55,6 +55,7 @@
                                  2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0,
                                  2000.0, 2400.
                              ),
-                         numberOfThicknesses = cms.uint32(4)
+                         numberOfThicknesses = cms.uint32(4),
+                         maxNumberOfThickIndices = cms.uint32(8)
                          )
 
diff --git a/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h b/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h
@@ -5,6 +5,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerTools.h"
 
+#include <cstdint>
 #include <vector>
 #include <utility>
 #include <unordered_map>
@@ -19,6 +20,7 @@ class HGCalVFESummationImpl {
 private:
   double lsb_silicon_fC_;
   double lsb_scintillator_MIP_;
+  uint32_t nThickness_;
   std::vector<double> thresholds_silicon_;
   double threshold_scintillator_;
 
diff --git a/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py
@@ -139,15 +139,17 @@
     chargeCollectionEfficiency = cms.PSet(refToPSet_ = cms.string("HGCAL_chargeCollectionEfficiencies")),
 )
 
-
-
 l1tHGCalVFEProducer = cms.EDProducer(
-        "HGCalVFEProducer",
-        eeDigis = cms.InputTag('simHGCalUnsuppressedDigis:EE'),
-        fhDigis = cms.InputTag('simHGCalUnsuppressedDigis:HEfront'),
-        bhDigis = cms.InputTag('simHGCalUnsuppressedDigis:HEback'),
-        ProcessorParameters = vfe_proc.clone()
-       )
+    "HGCalVFEProducer",
+    eeDigis = cms.InputTag('simHGCalUnsuppressedDigis:EE'),
+    fhDigis = cms.InputTag('simHGCalUnsuppressedDigis:HEfront'),
+    bhDigis = cms.InputTag('simHGCalUnsuppressedDigis:HEback'),
+    ProcessorParameters = vfe_proc.clone(
+        summationCfg = vfe_proc.summationCfg.clone(
+            numberOfThicknesses = HGCAL_reco_constants.numberOfThicknesses
+        )
+    )
+)
 
 l1tHFnoseVFEProducer = cms.EDProducer(
         "HFNoseVFEProducer",
diff --git a/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc b/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc
@@ -1,14 +1,16 @@
 #include "L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h"
+#include <cstdint>
 
 HGCalVFESummationImpl::HGCalVFESummationImpl(const edm::ParameterSet& conf)
     : lsb_silicon_fC_(conf.getParameter<double>("siliconCellLSB_fC")),
-      lsb_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")) {
-  constexpr unsigned nThickness = 3;
+      lsb_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")),
+      nThickness_(conf.getParameter<uint32_t>("numberOfThicknesses"))
+      {
   thresholds_silicon_ =
       conf.getParameter<edm::ParameterSet>("noiseSilicon").getParameter<std::vector<double>>("values");
-  if (thresholds_silicon_.size() != nThickness) {
+  if (thresholds_silicon_.size() != nThickness_) {
     throw cms::Exception("Configuration") << thresholds_silicon_.size() << " silicon thresholds are given instead of "
-                                          << nThickness << " (the number of sensor thicknesses)";
+                                          << nThickness_ << " (the number of sensor thicknesses)";
   }
   threshold_scintillator_ = conf.getParameter<edm::ParameterSet>("noiseScintillator").getParameter<double>("noise_MIP");
   const auto threshold = conf.getParameter<double>("noiseThreshold");
diff --git a/SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py b/SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py
@@ -2,13 +2,17 @@
 
 from SimCalorimetry.HGCalSimProducers.hgcROCParameters_cfi import hgcROCSettings
 from SimCalorimetry.HGCalSimAlgos.hgcSensorOpParams_cfi import hgcSiSensorIleak,hgcSiSensorCCE
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 # Base configurations for HGCal digitizers
 eV_per_eh_pair = 3.62
 fC_per_ele     = 1.6020506e-4
-nonAgedCCEs    = [1.0, 1.0, 1.0]
-nonAgedNoises  = [2100.0,2100.0,1600.0] #100,200,300 um (in electrons)
-nonAgedNoises_v9 = [2000.0,2400.0,2000.0] # 120,200,300 um (in electrons)
+nonAgedCCEs    = [1.0, 1.0, 1.0]            # HD120, LD200, LD300, HD120 um (in electrons) - the last entry will be ignored for v<v19
+nonAgedCCEs_v19    = [1.0, 1.0, 1.0, 1.0]            # HD120, LD200, LD300, HD120 um (in electrons) - the last entry will be ignored for v<v19
+nonAgedNoises  = [2100.0,2100.0,1600.0]   # " " notice the noise is further scaled by the size of the cell
+nonAgedNoises_v19  = [2100.0,2100.0,1600.0,2100.0]   # " " notice the noise is further scaled by the size of the cell
+nonAgedNoises_v9 = [2000.0,2400.0,2000.0] # " "
+nonAgedNoises_v9_v19 = [2000.0,2400.0,2000.0,2400.0] # " "
 thresholdTracksMIP = True
 
 HGCAL_ileakParam_toUse    = cms.PSet(
@@ -190,7 +194,9 @@
 
 #function to set noise to aged HGCal
 endOfLifeCCEs = [0.5, 0.5, 0.7] # this is to be deprecated
-endOfLifeNoises = [2400.0,2250.0,1750.0]  #this is to be deprecated
+endOfLifeNoises = [2400.0, 2250.0, 1750.0]  #this is to be deprecated
+endOfLifeCCEs_v19 = [0.5, 0.5, 0.7, 0.5] # this is to be deprecated
+endOfLifeNoises_v19 = [2400.0, 2250.0, 1750.0, 2250.0]  #this is to be deprecated
 def HGCal_setEndOfLifeNoise(process,byDose=True,byDoseAlgo=0,byDoseAlgoSci=2,byDoseFactor=1):
     """
     includes all effects from radiation and gain choice
@@ -321,6 +327,10 @@ def HGCal_setRealisticNoiseSi(process,byDose=True,byDoseAlgo=0,byDoseMap=doseMap
     process.HGCAL_noises = cms.PSet(
         values = cms.vdouble([x for x in endOfLifeNoises])  
         )
+    phase2_hgcalV19.toModify(HGCAL_noise_fC, values = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises_v19] )) #100,200,300 um, to be deprecated
+    phase2_hgcalV19.toModify(HGCAL_noise_fC, values = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises_v19] )) #100,200,300 um, to be deprecated
+    phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = cms.vdouble(endOfLifeNoises_v19))
+    phase2_hgcalV19.toModify(HGCAL_noise, values = cms.vdouble([x for x in endOfLifeNoises_v19]))
 
     return process
 
@@ -333,6 +343,8 @@ def HFNose_setRealisticNoiseSi(process,byDose=True,byDoseAlgo=0,byDoseMap=doseMa
         doseMap = byDoseMap,
         values = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises] ), #100,200,300 um
         )
+
+    phase2_hgcalV19.toModify(HFNose_noise_fC, values = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises_v19] )) #100,200,300 um, to be deprecated
     return process
 
 
@@ -376,17 +388,21 @@ def HGCal_disableNoise(process):
     process.HGCAL_noises = cms.PSet(
         values = cms.vdouble(0,0,0)
     )
+
+    phase2_hgcalV19.toModify(HGCAL_noise_fC, values = cms.vdouble(0.,0.,0.,0.))
+    phase2_hgcalV19.toModify(HGCAL_noises, values = cms.vdouble(0.,0.,0.,0.))
     return process
 
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 
 phase2_hgcalV10.toModify(HGCAL_noise_fC, values = [x*fC_per_ele for x in nonAgedNoises_v9])
 phase2_hgcalV10.toModify(HGCAL_noises, values = [x for x in nonAgedNoises_v9])
 
-from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
-phase2_hgcalV19.toModify(HGCAL_noise_fC, values = [x*fC_per_ele for x in nonAgedNoises_v9])
-phase2_hgcalV19.toModify(HGCAL_noises, values = [x for x in nonAgedNoises_v9])
+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"""

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@`
`55`	`55`	`2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0,`
`56`	`56`	`2000.0, 2400.`
`57`	`57`	`),`
`58`		`- numberOfThicknesses = cms.uint32(4)`
	`58`	`+ numberOfThicknesses = cms.uint32(4),`
	`59`	`+ maxNumberOfThickIndices = cms.uint32(8)`
`59`	`60`	`)`
`60`	`61`