Merge pull request #21168 from cmadrid1/CMSSW_9_4_0_pre2_206_oldPhase

HBHE: Adding new scintillator+Y11, 206, and 207 shapes for simulation and 2018 Data

CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h

@@ -32,7 +32,7 @@ class HcalPulseShapes {
   const Shape& hbShape() const { return hpdShape_; }
   const Shape& heShape() const { return hpdShape_; }
   const Shape& hfShape() const { return hfShape_; }
-  const Shape& hoShape(bool sipm=false) const { return sipm ? siPMShape_ : hpdShape_; }
+  const Shape& hoShape(bool sipm=false) const { return sipm ? siPMShapeHO_ : hpdShape_; }
   //  return Shape for given shapeType.
   const Shape& getShape(int shapeType) const;
   /// automatically figures out which shape to return
@@ -47,9 +47,13 @@ class HcalPulseShapes {
   static double analyticPulseShapeSiPMHO(double t);
   static double analyticPulseShapeSiPMHE(double t);
   static constexpr float Y11RANGE_ = nBinsSiPM_;
-  static constexpr float Y11MAX_ = 0.04;
-  static double Y11TimePDF(double t);
-  static double generatePhotonTime(CLHEP::HepRandomEngine* engine);
+  static constexpr float Y11MAX203_ = 0.04;
+  static constexpr float Y11MAX206_ = 0.08;
+  static double Y11203(double t);
+  static double Y11206(double t);
+  static double generatePhotonTime(CLHEP::HepRandomEngine* engine, unsigned int signalShape);
+  static double generatePhotonTime203(CLHEP::HepRandomEngine* engine);
+  static double generatePhotonTime206(CLHEP::HepRandomEngine* engine);
   //this function can take function pointers *or* functors!
   template <class F1, class F2>
   static std::vector<double> convolve(unsigned nbin, F1 f1, F2 f2){
@@ -68,10 +72,14 @@ class HcalPulseShapes {
   void computeHPDShape(float, float, float, float, float ,
                        float, float, float, Shape&);
   void computeHFShape();
-  void computeSiPMShape();
-  void computeSiPMShape2017();
+  void computeSiPMShapeHO();
+  void computeSiPMShapeHE203();
+  void computeSiPMShapeHE206();
   void computeSiPMShapeData2017();
-  Shape hpdShape_, hfShape_, siPMShape_, siPMShape2017_, siPMShapeData2017_;
+  void computeSiPMShapeData2018();
+  Shape hpdShape_, hfShape_, siPMShapeHO_;
+  Shape siPMShapeMC2017_, siPMShapeData2017_;
+  Shape siPMShapeMC2018_, siPMShapeData2018_;
   Shape hpdShape_v2, hpdShapeMC_v2;
   Shape hpdShape_v3, hpdShapeMC_v3;
   Shape hpdBV30Shape_v2, hpdBV30ShapeMC_v2;