make hgcROCSettings std::vectors

Author: waredjeb

SimCalorimetry/HGCalSimProducers/interface/HGCFEElectronics.h

@@ -198,7 +198,7 @@ class HGCFEElectronics {
   float adcSaturation_fC_, adcLSB_fC_, tdcLSB_fC_, tdcSaturation_fC_, adcThreshold_fC_, tdcOnset_fC_, toaLSB_ns_,
       tdcResolutionInNs_;
   uint32_t targetMIPvalue_ADC_;
-  std::array<float, 3> jitterNoise_ns_, jitterConstant_ns_, eventTimeOffset_ns_;
+  std::vector<float> jitterNoise_ns_, jitterConstant_ns_, eventTimeOffset_ns_;
   std::vector<float> noise_fC_;
   uint32_t toaMode_;
   uint32_t tdcNbits_;

SimCalorimetry/HGCalSimProducers/python/hgcROCParameters_cfi.py

@@ -41,9 +41,13 @@
         -919.13, 365.36, -14.10, 0.2,
         -21.85, 49.39,  22.21,  0.8,
         -0.28,   27.14,  43.95,
-        3.89048 )
+        3.89048 ),
+    eventTimeOffset_ns = cms.vdouble(0.2,0.2,0.2)
 )
 
 from Configuration.Eras.Modifier_phase2_hgcalV19_cff import phase2_hgcalV19
 phase2_hgcalV19.toModify(hgcROCSettings, tdcForToAOnset_fC = [12., 12., 12., 12.])
+phase2_hgcalV19.toModify(hgcROCSettings, jitterNoise_ns = [5., 5., 5., 5.])
+phase2_hgcalV19.toModify(hgcROCSettings, jitterConstant_ns = [0.2,0.2,0.2,0.2])
+phase2_hgcalV19.toModify(hgcROCSettings, eventTimeOffset_ns = [0.2,0.2,0.2,0.2])
 

SimCalorimetry/HGCalSimProducers/src/HGCFEElectronics.cc

@@ -95,20 +95,31 @@ HGCFEElectronics<DFr>::HGCFEElectronics(const edm::ParameterSet& ps)
 
   if (ps.exists("jitterNoise_ns")) {
     auto temp = ps.getParameter<std::vector<double> >("jitterNoise_ns");
+    jitterNoise_ns_.resize(temp.size());
     if (temp.size() == jitterNoise_ns_.size()) {
       std::copy_n(temp.begin(), temp.size(), jitterNoise_ns_.begin());
     } else {
-      throw cms::Exception("BadConfiguration") << " HGCFEElectronics wrong size for ToA jitterNoise ";
+      throw cms::Exception("BadConfiguration") << " HGCFEElectronics wrong size for ToA jitterNoise";
     }
   }
   if (ps.exists("jitterConstant_ns")) {
     auto temp = ps.getParameter<std::vector<double> >("jitterConstant_ns");
+    jitterConstant_ns_.resize(temp.size());
     if (temp.size() == jitterConstant_ns_.size()) {
       std::copy_n(temp.begin(), temp.size(), jitterConstant_ns_.begin());
     } else {
       throw cms::Exception("BadConfiguration") << " HGCFEElectronics wrong size for ToA jitterConstant ";
     }
   }
+  if (ps.exists("eventTimeOffset_ns")) {
+    auto temp = ps.getParameter<std::vector<double> >("eventTimeOffset_ns");
+    eventTimeOffset_ns_.resize(temp.size());
+    if (temp.size() == eventTimeOffset_ns_.size()) {
+      std::copy_n(temp.begin(), temp.size(), eventTimeOffset_ns_.begin());
+    } else {
+      throw cms::Exception("BadConfiguration") << " HGCFEElectronics wrong size for event time offset";
+    }
+  }
 }
 
 //