more fixes, tdcForToA

Author: waredjeb

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= cms.vdouble(12.,12.,12.,12.))

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

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

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

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

SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerBase.h

@@ -80,7 +80,7 @@ class HGCDigitizerBase {
   float keV2fC() const { return keV2fC_; }
   bool toaModeByEnergy() const { return (myFEelectronics_->toaMode() == HGCFEElectronics<DFr>::WEIGHTEDBYE); }
   float tdcOnset() const { return myFEelectronics_->getTDCOnset(); }
-  std::array<float, 3> tdcForToAOnset() const { return myFEelectronics_->getTDCForToAOnset(); }
+  std::array<float, 4> tdcForToAOnset() const { return myFEelectronics_->getTDCForToAOnset(); }
   DetId::Detector det() const { return det_; }
   ForwardSubdetector subdet() const { return subdet_; }
 

SimCalorimetry/HGCalSimProducers/interface/HGCFEElectronics.h

@@ -103,7 +103,7 @@ class HGCFEElectronics {
   float getMaxADC() { return adcSaturation_fC_; }
   float getMaxTDC() { return tdcSaturation_fC_; }
   float getTDCOnset() { return tdcOnset_fC_; }
-  std::array<float, 3> getTDCForToAOnset() { return tdcForToAOnset_fC_; }
+  std::array<float, 4> getTDCForToAOnset() { return tdcForToAOnset_fC_; }
   void setADClsb(float newLSB) { adcLSB_fC_ = newLSB; }
   void setTDCfsc(float newTDCfsc) {
     tdcSaturation_fC_ = newTDCfsc;
@@ -193,7 +193,7 @@ class HGCFEElectronics {
   //private members
   uint32_t fwVersion_;
   hgc_digi::FEADCPulseShape adcPulse_, pulseAvgT_;
-  std::array<float, 3> tdcForToAOnset_fC_;
+  std::array<float, 4> tdcForToAOnset_fC_;
   std::vector<float> tdcChargeDrainParameterisation_;
   float adcSaturation_fC_, adcLSB_fC_, tdcLSB_fC_, tdcSaturation_fC_, adcThreshold_fC_, tdcOnset_fC_, toaLSB_ns_,
       tdcResolutionInNs_;

SimCalorimetry/HGCalSimProducers/plugins/HGCDigitizer.cc

@@ -119,7 +119,7 @@ namespace {
                                        const float minCharge,
                                        const float maxCharge,
                                        bool setIfZero,
-                                       const std::array<float, 3>& tdcForToAOnset,
+                                       const std::array<float, 4>& tdcForToAOnset,
                                        const bool minbiasFlag,
                                        std::unordered_map<uint32_t, bool>& hitOrder_monitor,
                                        const unsigned int thisBx) {

SimCalorimetry/HGCalSimProducers/python/hgcROCParameters_cfi.py

@@ -43,3 +43,7 @@
         -0.28,   27.14,  43.95,
         3.89048 )
 )
+
+from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
+phase2_hgcalV19.toModify(hgcROCSettings, tdcForToAOnset_fC = [12., 12., 12., 12.])
+

SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py

@@ -403,6 +403,9 @@ 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(hgchebackDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = cms.vdouble(12.,12.,12.,12.))
+
+
 
 def HFNose_setEndOfLifeNoise(process,byDose=True,byDoseAlgo=0,byDoseFactor=1):
     """includes all effects from radiation and gain choice"""

SimCalorimetry/HGCalSimProducers/src/HGCFEElectronics.cc

@@ -74,6 +74,7 @@ HGCFEElectronics<DFr>::HGCFEElectronics(const edm::ParameterSet& ps)
     tdcOnset_fC_ = ps.getParameter<double>("tdcOnset_fC");
   if (ps.exists("tdcForToAOnset_fC")) {
     auto temp = ps.getParameter<std::vector<double> >("tdcForToAOnset_fC");
+    std::cout << "temp " << temp.size() << " tdcForToaOnset " << tdcForToAOnset_fC_.size() << std::endl;
     if (temp.size() == tdcForToAOnset_fC_.size()) {
       std::copy_n(temp.begin(), temp.size(), tdcForToAOnset_fC_.begin());
     } else {