Update EcalBarrelGeometryLoaderFromDDD.cc

bsunanda · web-flow · commit b18a03020aac · 2020-11-01T06:48:23.000-06:00
Correct EcalBarrelAlgo
diff --git a/Geometry/EcalAlgo/plugins/EcalBarrelGeometryLoaderFromDDD.cc b/Geometry/EcalAlgo/plugins/EcalBarrelGeometryLoaderFromDDD.cc
@@ -36,7 +36,7 @@ void EcalBGL::fillGeom(EcalBarrelGeometry* geom,
   pv.reserve(size);
   for (unsigned int i(0); i != size; ++i) {
     unsigned int ii = ioff + i;
-    const CCGFloat factor(1 == ii || 2 == ii || 6 == ii || 10 == ii ? 1 : (CCGFloat)scale);
+    const CCGFloat factor(1 == i || 2 == i || 6 == i || 10 == i ? 1 : static_cast<CCGFloat>(scale));
     pv.emplace_back(factor * vv[ii]);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void EcalBGL::fillGeom(EcalBarrelGeometry* geom,`
`36`	`36`	`pv.reserve(size);`
`37`	`37`	`for (unsigned int i(0); i != size; ++i) {`
`38`	`38`	`unsigned int ii = ioff + i;`
`39`		`- const CCGFloat factor(1 == ii \|\| 2 == ii \|\| 6 == ii \|\| 10 == ii ? 1 : (CCGFloat)scale);`
	`39`	`+ const CCGFloat factor(1 == i \|\| 2 == i \|\| 6 == i \|\| 10 == i ? 1 : static_cast<CCGFloat>(scale));`
`40`	`40`	`pv.emplace_back(factor * vv[ii]);`
`41`	`41`	`}`
`42`	`42`