Merge pull request #48538 from bsunanda/Phse2-hgx364V

Phse2-hgx364V Provide a method to extract thicknesses of depleted layers of different types of silicon wafers

Author: cmsbuild

Geometry/HGCalCommonData/interface/HGCalDDDConstants.h

@@ -67,6 +67,7 @@ class HGCalDDDConstants {
   inline std::pair<double, double> cellSizeTrap(int type, int irad) const {
     return std::make_pair(hgpar_->radiusLayer_[type][irad - 1], hgpar_->radiusLayer_[type][irad]);
   }
+  std::vector<double> cellThickness() const;
   double cellThickness(int layer, int waferU, int waferV) const;
   int32_t cellType(int type, int waferU, int waferV, int iz, int fwdBack, int orient) const;
   double distFromEdgeHex(double x, double y, double z) const;

Geometry/HGCalCommonData/interface/HGCalGeomParameters.h

@@ -86,6 +86,7 @@ class HGCalGeomParameters {
   void loadCellParsHexagon(const cms::DDVectorsMap& vmap, HGCalParameters& php);
   void loadCellParsHexagon(const HGCalParameters& php);
   void loadCellTrapezoid(HGCalParameters& php);
+  static void rescale(std::vector<double>&, const double s);
 
   struct layerParameters {
     double rmin, rmax, zpos;
@@ -153,7 +154,6 @@ class HGCalGeomParameters {
                                          int wafer,
                                          double xx,
                                          double yy);
-  void rescale(std::vector<double>&, const double s);
   void resetZero(std::vector<double>&);
 
   constexpr static double tan30deg_ = 0.5773502693;

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -407,6 +407,18 @@ bool HGCalDDDConstants::cellInLayer(int waferU, int waferV, int cellU, int cellV
   }
 }
 
+std::vector<double> HGCalDDDConstants::cellThickness() const {
+  std::vector<double> thick;
+  if (waferHexagon8()) {
+    thick = hgpar_->cellThickness_;
+    HGCalGeomParameters::rescale(thick, 10000.0);  //cm to micron
+  } else if (waferHexagon6()) {
+    for (int k = 0; k < 3; ++k)
+      thick.emplace_back(100.0 * (k + 1));
+  }
+  return thick;
+}
+
 double HGCalDDDConstants::cellThickness(int layer, int waferU, int waferV) const {
   double thick(-1);
   int type = waferType(layer, waferU, waferV, false);

Geometry/HGCalCommonData/src/HGCalGeomParameters.cc

@@ -2633,6 +2633,10 @@ std::vector<double> HGCalGeomParameters::getDDDArray(const std::string& str, con
   }
 }
 
+void HGCalGeomParameters::rescale(std::vector<double>& v, const double s) {
+  std::for_each(v.begin(), v.end(), [s](double& n) { n *= s; });
+}
+
 std::pair<double, double> HGCalGeomParameters::cellPosition(
     const std::vector<HGCalGeomParameters::cellParameters>& wafers,
     std::vector<HGCalGeomParameters::cellParameters>::const_iterator& itrf,
@@ -2660,10 +2664,6 @@ std::pair<double, double> HGCalGeomParameters::cellPosition(
   return std::make_pair(dx, dy);
 }
 
-void HGCalGeomParameters::rescale(std::vector<double>& v, const double s) {
-  std::for_each(v.begin(), v.end(), [s](double& n) { n *= s; });
-}
-
 void HGCalGeomParameters::resetZero(std::vector<double>& v) {
   for (auto& n : v) {
     if (std::abs(n) < tolmin)

Geometry/HGCalGeometry/test/HGCalGeometryDump.cc

@@ -10,6 +10,7 @@
 #include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
 #include <iostream>
+#include <sstream>
 
 class HGCalGeometryDump : public edm::one::EDAnalyzer<> {
 public:
@@ -49,6 +50,14 @@ void HGCalGeometryDump::analyze(const edm::Event& /*iEvent*/, const edm::EventSe
   for (unsigned int k = 0; k < names_.size(); ++k) {
     const auto& geomR = iSetup.getData(geomTokens_[k]);
     const HGCalGeometry* geom = &geomR;
+
+    std::vector<double> thick = geom->topology().dddConstants().cellThickness();
+    std::ostringstream st1;
+    st1 << "Geometry has " << thick.size() << " wafers of thickness (micron)";
+    for (unsigned int k = 0; k < thick.size(); ++k)
+      st1 << " : " << thick[k];
+    edm::LogVerbatim("HGCalGeomX") << st1.str() << std::endl;
+
     const std::vector<DetId>& ids = geom->getValidDetIds();
     edm::LogVerbatim("HGCalGeomX") << ids.size() << " valid Ids for detector " << names_[k];
     int nall(0);

Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py

@@ -46,7 +46,7 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):
-    process.MessageLogger.HGCalGeom=dict()
+    process.MessageLogger.HGCalGeomX=dict()
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(