Merge pull request #48284 from bsunanda/Phse2-hgx364P

cmsbuild · web-flow · commit 31ab4d2e106f · 2025-06-11T10:14:23.000+02:00
Phs2-hgx364P Update the definition of placement index so that the guard ring implementation in partial wafer can work fine
diff --git a/Geometry/HGCalCommonData/src/HGCalCell.cc b/Geometry/HGCalCommonData/src/HGCalCell.cc
@@ -237,15 +237,15 @@ std::pair<int, int> HGCalCell::cellUV2Cell(int32_t u, int32_t v, int32_t placeme
 }
 
 int HGCalCell::cellPlacementIndex(int32_t iz, int32_t frontBack, int32_t orient) {
-  int32_t indx = ((iz * frontBack) > 0) ? orient : (orient + HGCalCell::cellPlacementExtra);
+  int32_t indx = (frontBack > 0) ? orient : (orient + HGCalCell::cellPlacementExtra);
   return indx;
 }
 
 std::pair<int32_t, int32_t> HGCalCell::cellOrient(int32_t placementIndex) {
   int32_t orient = (placementIndex >= HGCalCell::cellPlacementExtra) ? (placementIndex - HGCalCell::cellPlacementExtra)
                                                                      : placementIndex;
-  int32_t frontBackZside = (placementIndex >= HGCalCell::cellPlacementExtra) ? 1 : -1;
-  return std::make_pair(orient, frontBackZside);
+  int32_t frontBack = (placementIndex >= HGCalCell::cellPlacementExtra) ? 1 : -1;
+  return std::make_pair(orient, frontBack);
 }
 
 std::pair<int32_t, int32_t> HGCalCell::cellType(int32_t u, int32_t v, int32_t ncell, int32_t placementIndex) {

Original file line number	Diff line number	Diff line change
`@@ -237,15 +237,15 @@ std::pair<int, int> HGCalCell::cellUV2Cell(int32_t u, int32_t v, int32_t placeme`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`int HGCalCell::cellPlacementIndex(int32_t iz, int32_t frontBack, int32_t orient) {`
`240`		`- int32_t indx = ((iz * frontBack) > 0) ? orient : (orient + HGCalCell::cellPlacementExtra);`
	`240`	`+ int32_t indx = (frontBack > 0) ? orient : (orient + HGCalCell::cellPlacementExtra);`
`241`	`241`	`return indx;`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`std::pair<int32_t, int32_t> HGCalCell::cellOrient(int32_t placementIndex) {`
`245`	`245`	`int32_t orient = (placementIndex >= HGCalCell::cellPlacementExtra) ? (placementIndex - HGCalCell::cellPlacementExtra)`
`246`	`246`	`: placementIndex;`
`247`		`- int32_t frontBackZside = (placementIndex >= HGCalCell::cellPlacementExtra) ? 1 : -1;`
`248`		`- return std::make_pair(orient, frontBackZside);`
	`247`	`+ int32_t frontBack = (placementIndex >= HGCalCell::cellPlacementExtra) ? 1 : -1;`
	`248`	`+ return std::make_pair(orient, frontBack);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`std::pair<int32_t, int32_t> HGCalCell::cellType(int32_t u, int32_t v, int32_t ncell, int32_t placementIndex) {`