Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DD4hep: Tracker overlaps on PixelForwardDiskRings #27736

Merged
merged 2 commits into from Aug 11, 2019
Merged

DD4hep: Tracker overlaps on PixelForwardDiskRings #27736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36d89f
Fix CutTube constructor
vargasa Aug 9, 2019
66d099a
dd4hep::CutTube constructor uses endPhi instead of deltaPhi https://d…
vargasa Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc
View file
Open in desktop
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDDefinitions2Objects.cc
View file
Open in desktop
Expand Up @@ -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
Expand Down