Improve the u,v to x,y conversion for partial wafers

Author: Sunanda

Geometry/HGCalCommonData/interface/HGCalDDDConstants.h

@@ -146,6 +146,12 @@ class HGCalDDDConstants {
   std::vector<int> numberCells(int lay, bool reco) const;
   int numberCellsHexagon(int wafer) const;
   int numberCellsHexagon(int lay, int waferU, int waferV, bool flag) const;
+  inline int partialWaferType(int lay, int waferU, int waferV) const {
+    int indx = HGCalWaferIndex::waferIndex(lay, waferU, waferV);
+    auto ktr = hgpar_->waferInfoMap_.find(indx);
+    int part = (ktr != hgpar_->waferInfoMap_.end()) ? (ktr->second).part : HGCalTypes::WaferFull;
+    return part;
+  }
   std::pair<double, double> rangeR(double z, bool reco) const;
   std::pair<double, double> rangeRLayer(int lay, bool reco) const;
   std::pair<double, double> rangeZ(bool reco) const;

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -867,7 +867,8 @@ std::pair<float, float> HGCalDDDConstants::locateCell(int zside,
       if (ktr != hgpar_->waferInfoMap_.end())
         place = HGCalCell::cellPlacementIndex(1, HGCalTypes::layerFrontBack(layertype), (ktr->second).orient);
     }
-    auto xy = (waferHexagon8Fine() || cog) ? cellOffset_->cellOffsetUV2XY1(cellU, cellV, place, type)
+    int part = partialWaferType(lay, waferU, waferV);
+    auto xy = (waferHexagon8Fine() || cog) ? cellOffset_->cellOffsetUV2XY1(cellU, cellV, place, type, part)
                                            : hgcell_->cellUV2XY2(cellU, cellV, place, type);
     x = xy.first;
     y = xy.second;