Merge pull request #27736 from vargasa/OverlapsInnerDiskOuterRing

DD4hep: Tracker overlaps on PixelForwardDiskRings
cms-sw · Aug 11, 2019 · 9db60f5 · 9db60f5
2 parents f304045 + 66d099a
commit 9db60f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc b/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc
@@ -166,13 +166,10 @@ static long algorithm(dd4hep::Detector& /* description */,
       n_y_t /= norm;
       n_z_t /= norm;
 
-      // the cuttubs wants a delta phi
-      double dphi = phi2 - phi1;
-
-      auto seg = dd4hep::CutTube(r_min, r_max, dz, phi1, dphi, n_x_l, n_y_l, n_z_l, n_x_t, n_y_t, n_z_t);
+      auto seg = dd4hep::CutTube(r_min, r_max, dz, phi1, phi2, n_x_l, n_y_l, n_z_l, n_x_t, n_y_t, n_z_t);
 
       edm::LogVerbatim("TrackerGeom") << "DDCutTubsFromPoints: CutTube(" << r_min << "," << r_max << "," << dz << ","
-                                      << phi1 << "," << dphi << "," << n_x_l << "," << n_y_l << "," << n_z_l << ","
+                                      << phi1 << "," << phi2 << "," << n_x_l << "," << n_y_l << "," << n_z_l << ","
                                       << n_x_t << "," << n_y_t << "," << n_z_t << ")";
 
       segments.emplace_back(seg);

diff --git a/DetectorDescription/DDCMS/plugins/DDDefinitions2Objects.cc b/DetectorDescription/DDCMS/plugins/DDDefinitions2Objects.cc
@@ -1334,7 +1334,7 @@ void Converter<DDLCutTubs>::operator()(xml_h element) const {
            rmax,
            startPhi,
            deltaPhi);
-  ns.addSolid(nam, CutTube(rmin, rmax, dz, startPhi, deltaPhi, lx, ly, lz, tx, ty, tz));
+  ns.addSolid(nam, CutTube(rmin, rmax, dz, startPhi, startPhi + deltaPhi, lx, ly, lz, tx, ty, tz));
 }
 
 /// Converter for <TruncTubs/> tags