Merge pull request #48303 from waredjeb/fix_V19_HLT_RECO_PR

Fix crashes in HGCAL HLT/RECO with v19 geometry

Author: cmsbuild

DataFormats/ForwardDetId/interface/HGCalTriggerDetId.h

@@ -26,6 +26,7 @@
 
 class HGCalTriggerDetId : public DetId {
 public:
+  enum waferType { HGCalHD120 = 0, HGCalLD200 = 1, HGCalLD300 = 2, HGCalHD200 = 3 };
   static const int HGCalTriggerCell = 4;
 
   /** Create a null cellid*/
@@ -46,6 +47,8 @@ class HGCalTriggerDetId : public DetId {
 
   /// get the type
   int type() const { return (id_ >> kHGCalTypeOffset) & kHGCalTypeMask; }
+  bool lowDensity() const { return ((type() == HGCalLD200) || (type() == HGCalLD300)); }
+  bool highDensity() const { return ((type() == HGCalHD120) || (type() == HGCalHD200)); }
 
   /// get the z-side of the cell (1/-1)
   int zside() const { return (((id_ >> kHGCalZsideOffset) & kHGCalZsideMask) ? -1 : 1); }

DataFormats/ForwardDetId/interface/HGCalTriggerModuleDetId.h

@@ -18,6 +18,7 @@
    [19:20] Type (0 fine divisions of wafer with 120 mum thick silicon
                  1 coarse divisions of wafer with 200 mum thick silicon
                  2 coarse divisions of wafer with 300 mum thick silicon
+                 3 fine divisions of wafer with 200 mum thick silicon
                  0 fine divisions of scintillators
                  1 coarse divisions of scintillators)
 
@@ -30,6 +31,8 @@
 
 class HGCalTriggerModuleDetId : public DetId {
 public:
+  enum siliconType { HGCalHD120 = 0, HGCalLD200 = 1, HGCalLD300 = 2, HGCalHD200 = 3 };
+  enum tileGranularity { HGCalTileNormal = 0, HGCalTileFine = 1 };
   /** Create a null module id*/
   HGCalTriggerModuleDetId();
   /** Create module id from raw id (0=invalid id) */
@@ -72,6 +75,15 @@ class HGCalTriggerModuleDetId : public DetId {
   /// get the scintillator panel phi
   int phi() const { return moduleV(); }
 
+  bool isSiliconLowDensity() const {
+    return (!isHScintillator() && ((type() == HGCalLD200) || (type() == HGCalLD300)));
+  }
+  bool isSiliconHighDensity() const {
+    return (!isHScintillator() && ((type() == HGCalHD120) || (type() == HGCalHD200)));
+  }
+  bool isScintillatorFine() const { return (isHScintillator() && (type() == HGCalTileFine)); }
+  bool isScintillatorCoarse() const { return (isHScintillator() && (type() == HGCalTileNormal)); }
+
   /// consistency check : no bits left => no overhead
   bool isHFNose() const { return (triggerSubdetId() == HFNoseTrigger); }
   bool isEE() const { return (triggerSubdetId() == HGCalEETrigger); }

HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHitL1Seeded_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
 
 
 hltHGCalRecHitL1Seeded = cms.EDProducer("HGCalRecHitProducer",
@@ -60,3 +61,10 @@
     thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
     thicknessNoseCorrection = cms.vdouble(1.132, 1.092, 1.084)
 )
+
+phase2_hgcalV19.toModify(hltHGCalRecHitL1Seeded, 
+                         HGCEE_fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4],
+                         HGCHEF_fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8],
+                         HGCHFNose_fCPerMIP = [1.25, 2.57, 3.88, 2.57],
+
+                         )

HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHit_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
 
 hltHGCalRecHit = cms.EDProducer("HGCalRecHitProducer",
     HGCEE_cce = cms.PSet(
@@ -59,3 +60,9 @@
     thicknessCorrection = HGCAL_reco_constants.thicknessCorrection,
     thicknessNoseCorrection = cms.vdouble(1.132, 1.092, 1.084)
 )
+
+phase2_hgcalV19.toModify(hltHGCalRecHit, 
+                         HGCEE_fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4],
+                         HGCHEF_fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8],
+                         HGCHFNose_fCPerMIP = [1.25, 2.57, 3.88, 2.57],
+                         )

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,20 @@
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
 ticl_v5.toModify(hltHGCalUncalibRecHitL1Seeded, computeLocalTime = cms.bool(True))
+
+_modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCEEConfig.clone(
+    fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4]
+)
+_modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHEFConfig.clone(
+    fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8]
+)
+_modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHFNoseConfig.clone(
+    fCPerMIP = [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,21 @@
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
 ticl_v5.toModify(hltHGCalUncalibRecHit, computeLocalTime = cms.bool(True))
+
+
+_modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHit.HGCEEConfig.clone(
+    fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4]
+)
+_modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHit.HGCHEFConfig.clone(
+    fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8]
+)
+_modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHit.HGCHFNoseConfig.clone(
+    fCPerMIP = [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_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 =  [1.0, 1.0,1.0,1.0])

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 = [0.32041011999999996, 0.384492144, 0.32041011999999996, 0.384492144])

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

@@ -1,4 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 HGCAL_reco_constants = cms.PSet(
     dEdXweights = cms.vdouble(
@@ -38,6 +39,23 @@
       referenceXtalk = cms.double(-1),
       noise_MIP = cms.double(0.01)
     ),
+    numberOfThicknesses = cms.uint32(3)
 
 )
 
+
+
+phase2_hgcalV19.toModify(HGCAL_reco_constants, 
+                         thicknessCorrection = [0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85] , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD,
+                         fcPerMip = 
+                                 [2.06, 3.43, 5.15, 3.43, 2.06, 3.43,
+                                 5.15, 3.43]
+                             ,
+                         noises = 
+                                 [2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0,
+                                 2000.0, 2400.]
+                             ,
+                         numberOfThicknesses = 4,
+                         maxNumberOfThickIndices = 8,
+                         thresholdW0 = [2.9, 2.9, 2.9, 2.9],
+                         )

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

@@ -1,4 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 
 hgceeDigitizer = cms.PSet(
     NoiseGeneration_Method = cms.bool(True),
@@ -63,4 +64,6 @@
     tofDelay = cms.double(5),
     useAllChannels = cms.bool(True),
     verbosity = cms.untracked.uint32(0)
-)
+)
+
+phase2_hgcalV19.toModify(hgceeDigitizer.digiCfg.feCfg, tdcForToAOnset_fC= [12.,12.,12.,12.])