Code check

Author: Sunanda

Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc

@@ -155,13 +155,16 @@ void DDHGCalPassive::execute(DDCompactView& cpv) {
       int nsec = 2 * parts_ + 2;
       std::vector<double> xM(nsec, 0), yM(nsec, 0);
       for (int n = 0; n <= parts_; ++n) {
-	double phi0 = phi1 + n * dphi0;
-	if (n == 0) {
-	  xM[0] = rinB * cos(phi0);  yM[0] = rinB * sin(phi0);
-	} else {
-	  xM[nsec - n] = rinB * cos(phi0);  yM[nsec - n] = rinB * sin(phi0);
-	}
-	xM[n + 1] = routF * cos(phi0); yM[n + 1] = routF * sin(phi0);
+        double phi0 = phi1 + n * dphi0;
+        if (n == 0) {
+          xM[0] = rinB * cos(phi0);
+          yM[0] = rinB * sin(phi0);
+        } else {
+          xM[nsec - n] = rinB * cos(phi0);
+          yM[nsec - n] = rinB * sin(phi0);
+        }
+        xM[n + 1] = routF * cos(phi0);
+        yM[n + 1] = routF * sin(phi0);
       }
       std::vector<double> zw = {-0.5 * thick_, 0.5 * thick_};
       std::vector<double> zx(2, 0), zy(2, 0), scale(2, 1.0);
@@ -174,7 +177,8 @@ void DDHGCalPassive::execute(DDCompactView& cpv) {
       edm::LogVerbatim("HGCalGeom") << "DDHGCalPassive: " << solid.name() << " extruded polygon made of " << matName
                                     << " z|x|y|s (0) " << zw[0] << ":" << zx[0] << ":" << zy[0] << ":" << scale[0]
                                     << " z|x|y|s (1) " << zw[1] << ":" << zx[1] << ":" << zy[1] << ":" << scale[1]
-                                    << " and " << xM.size() << " edges with " << parts_ << " parts between " << convertRadToDeg(phi1) << " and " << convertRadToDeg(phi2);
+                                    << " and " << xM.size() << " edges with " << parts_ << " parts between "
+                                    << convertRadToDeg(phi1) << " and " << convertRadToDeg(phi2);
       for (unsigned int kk = 0; kk < xM.size(); ++kk)
         edm::LogVerbatim("HGCalGeom") << "[" << kk << "] " << xM[kk] << ":" << yM[kk];
 #endif

Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalPassive.cc

@@ -39,8 +39,8 @@ struct HGCalPassive {
     int parts = args.value<int>("Parts");                   // number of parts in units of 30 degree
     if (parts < 0)
       parts = 1;
-    double phi0 = args.value<double>("PhiStart");           // Start phi of the first cassette
-    double dphi = (2._pi) / tagSector.size();               // delta phi of the cassette
+    double phi0 = args.value<double>("PhiStart");  // Start phi of the first cassette
+    double dphi = (2._pi) / tagSector.size();      // delta phi of the cassette
 #ifdef EDM_ML_DEBUG
     edm::LogVerbatim("HGCalGeom") << "DDHGCalPassive: " << tagLayer.size() << " Modules with base name " << parentName
                                   << " made of " << material << " T " << thick << " Sectors " << tagSector.size()
@@ -105,31 +105,35 @@ struct HGCalPassive {
       for (unsigned int k = 0; k < tagSector.size(); ++k) {
         std::string parentName = args.parentName() + tagLayer[j] + tagSector[k];
         double phi1 = phi0 + k * dphi;
-	double dphi0 = dphi / parts;
-	// First the mother
-	int nsec = 2 * parts + 2;
-	std::vector<double> xM(nsec, 0), yM(nsec, 0);
-	for (int n = 0; n <= parts; ++n) {
-	  double phi0 = phi1 + n * dphi0;
-	  if (n == 0) {
-	    xM[0] = rinB * cos(phi0);  yM[0] = rinB * sin(phi0);
-	  } else {
-	    xM[nsec - n] = rinB * cos(phi0);  yM[nsec - n] = rinB * sin(phi0);
-	  }
-	  xM[n + 1] = routF * cos(phi0); yM[n + 1] = routF * sin(phi0);
-	}
+        double dphi0 = dphi / parts;
+        // First the mother
+        int nsec = 2 * parts + 2;
+        std::vector<double> xM(nsec, 0), yM(nsec, 0);
+        for (int n = 0; n <= parts; ++n) {
+          double phi0 = phi1 + n * dphi0;
+          if (n == 0) {
+            xM[0] = rinB * cos(phi0);
+            yM[0] = rinB * sin(phi0);
+          } else {
+            xM[nsec - n] = rinB * cos(phi0);
+            yM[nsec - n] = rinB * sin(phi0);
+          }
+          xM[n + 1] = routF * cos(phi0);
+          yM[n + 1] = routF * sin(phi0);
+        }
         std::vector<double> zw = {-0.5 * thick, 0.5 * thick};
         std::vector<double> zx(2, 0), zy(2, 0), scale(2, 1.0);
         dd4hep::Solid solid = dd4hep::ExtrudedPolygon(xM, yM, zw, zx, zy, scale);
         ns.addSolidNS(ns.prepend(parentName), solid);
         dd4hep::Material matter = ns.material(material);
         dd4hep::Volume glogM = dd4hep::Volume(solid.name(), solid, matter);
 #ifdef EDM_ML_DEBUG
-	double phi2 = phi1 + dphi;
+        double phi2 = phi1 + dphi;
         edm::LogVerbatim("HGCalGeom") << "DDHGCalPassive: " << solid.name() << " extruded polygon made of "
                                       << matter.name() << " z|x|y|s (0) " << zw[0] << ":" << zx[0] << ":" << zy[0]
                                       << ":" << scale[0] << " z|x|y|s (1) " << zw[1] << ":" << zx[1] << ":" << zy[1]
-                                    << ":" << scale[1] << " and " << xM.size() << " edges with " << parts << " parts between " << convertRadToDeg(phi1) << " and " << convertRadToDeg(phi2);
+                                      << ":" << scale[1] << " and " << xM.size() << " edges with " << parts
+                                      << " parts between " << convertRadToDeg(phi1) << " and " << convertRadToDeg(phi2);
         for (unsigned int kk = 0; kk < xM.size(); ++kk)
           edm::LogVerbatim("HGCalGeom") << "[" << kk << "] " << xM[kk] << ":" << yM[kk];
 #endif