Merge pull request #26620 from bsunanda/Phase2-hgx195

Phase2-hgx195 Add new access code for scintillator cells of HGCal
cms-sw · May 8, 2019 · a55a7db · a55a7db
2 parents c43e052 + fed990a
commit a55a7db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
@@ -47,12 +47,13 @@ class HGCalDDDConstants {
   std::array<int, 5> assignCellHex(float x, float y, int lay, bool reco) const;
   std::array<int, 3> assignCellTrap(float x, float y, float z, int lay,
                                     bool reco) const;
+  std::pair<double, double> cellEtaPhiTrap(int type, int irad) const;
   bool cellInLayer(int waferU, int waferV, int cellU, int cellV, int lay,
                    bool reco) const;
   double cellSizeHex(int type) const;
   std::pair<double, double> cellSizeTrap(int type, int irad) const {
-    return std::pair<double, double>(hgpar_->radiusLayer_[type][irad - 1],
-                                     hgpar_->radiusLayer_[type][irad]);
+    return std::make_pair(hgpar_->radiusLayer_[type][irad - 1],
+			  hgpar_->radiusLayer_[type][irad]);
   }
   double cellThickness(int layer, int waferU, int waferV) const;
   CellType cellType(int type, int waferU, int waferV) const;
@@ -70,6 +71,11 @@ class HGCalDDDConstants {
   const HGCalParameters* getParameter() const { return hgpar_; }
   int getPhiBins(int lay) const;
   std::pair<int, int> getREtaRange(int lay) const;
+  const std::vector<double> & getRadiusLayer(int layer) const {
+    int type = ((mode_ == HGCalGeometryMode::Trapezoid) ? 
+		hgpar_->scintType(layer) : 0);
+    return hgpar_->radiusLayer_[type];
+  }
   HGCalParameters::hgtrform getTrForm(unsigned int k) const {
     return hgpar_->getTrForm(k);
   }

diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
@@ -533,7 +533,7 @@ void DDHGCalHEAlgo::positionSensitive(const DDLogicalPart& glog, double rin,
           cpv.position(name, glog.ddname(), copy, tran, rotation);
 #ifdef EDM_ML_DEBUG
           ++ntype[type];
-	  edm::LogVerbatim("HGCalGeom")
+          edm::LogVerbatim("HGCalGeom")
             << "DDHGCalHEAlgo: " << name << " number " << copy
             << " positioned in " << glog.ddname() << " at " << tran
             << " with " << rotation;

diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -201,6 +201,19 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
   return std::array<int, 3>{{irad, iphi, type}};
 }
 
+std::pair<double, double> HGCalDDDConstants::cellEtaPhiTrap(int type, 
+							    int irad) const {
+  double dr(0), df(0);
+  if (mode_ == HGCalGeometryMode::Trapezoid) {
+    double r = 0.5*((hgpar_->radiusLayer_[type][irad-1] +
+		     hgpar_->radiusLayer_[type][irad]));
+    dr       = (hgpar_->radiusLayer_[type][irad] - 
+		hgpar_->radiusLayer_[type][irad-1]);
+    df       = r * hgpar_->cellSize_[type];
+  }
+  return std::make_pair(dr,df);
+}
+
 bool HGCalDDDConstants::cellInLayer(int waferU, int waferV, int cellU,
                                     int cellV, int lay, bool reco) const {
   const auto& indx = getIndex(lay, true);
@@ -1064,7 +1077,7 @@ std::pair<double, double> HGCalDDDConstants::rangeR(double z, bool reco) const {
   edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants:rangeR: " << z << ":"
                                 << zz << " R " << rmin << ":" << rmax;
 #endif
-  return std::pair<double, double>(rmin, rmax);
+  return std::make_pair(rmin, rmax);
 }
 
 std::pair<double, double> HGCalDDDConstants::rangeZ(bool reco) const {
@@ -1079,7 +1092,7 @@ std::pair<double, double> HGCalDDDConstants::rangeZ(bool reco) const {
     zmin *= HGCalParameters::k_ScaleToDDD;
     zmax *= HGCalParameters::k_ScaleToDDD;
   }
-  return std::pair<double, double>(zmin, zmax);
+  return std::make_pair(zmin, zmax);
 }
 
 std::pair<int, int> HGCalDDDConstants::rowColumnWafer(int wafer) const {