From 05345b4b829f810c9a10b66bd5054e8131992ce7 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Tue, 26 Aug 2025 13:54:04 -0400 Subject: [PATCH 01/17] update disks geo --- compact/tracking/definitions_craterlake.xml | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml index 8eaed9d6c0..4a1b89529f 100644 --- a/compact/tracking/definitions_craterlake.xml +++ b/compact/tracking/definitions_craterlake.xml @@ -104,19 +104,19 @@ Main parameters for MPGD endcap disks, offset here is the distance between disks - - - - - - - - - - - - - + + + + + + + + + + + + + See compact/definitions.xml for reserved detector id From 1a851b1d6ce732275bc71fad5ef1b6f13d8be6ec Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Wed, 27 Aug 2025 10:04:19 -0400 Subject: [PATCH 02/17] Update barrel geoms --- compact/tracking/definitions_craterlake.xml | 12 ++++++------ compact/tracking/mpgd_barrel.xml | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml index 4a1b89529f..757f9fa68f 100644 --- a/compact/tracking/definitions_craterlake.xml +++ b/compact/tracking/definitions_craterlake.xml @@ -27,15 +27,15 @@ Main parameters for the outer MPGD barrel layer - - - + + + Inner MPGD unsegmented barrel - + - negative z - positive z + negative z + positive z diff --git a/compact/tracking/mpgd_barrel.xml b/compact/tracking/mpgd_barrel.xml index 0dc87d5b73..433ccf0b91 100644 --- a/compact/tracking/mpgd_barrel.xml +++ b/compact/tracking/mpgd_barrel.xml @@ -52,9 +52,10 @@ In principle, stave count should not be independenty specified: it is fixed by above intrinsic parameters + 1.3cm is to make envelope match CAD drawings - + From dd940b1f0cfd3139977aeed8c6648f23ce4c8931 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Fri, 5 Sep 2025 10:56:57 -0400 Subject: [PATCH 03/17] Update geo --- compact/tracking/definitions_craterlake.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml index 757f9fa68f..aa3f196091 100644 --- a/compact/tracking/definitions_craterlake.xml +++ b/compact/tracking/definitions_craterlake.xml @@ -28,8 +28,8 @@ Main parameters for the outer MPGD barrel layer - - + + Inner MPGD unsegmented barrel From 7ffb392ba75cf99d522f81e86e20c81f664355be Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Fri, 5 Sep 2025 10:57:18 -0400 Subject: [PATCH 04/17] update bot geo --- compact/tracking/mpgd_outerbarrel.xml | 42 +++++++++++++++------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index c4ac71da78..6bd092ba51 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -13,20 +13,21 @@ Frames - + Module constants - + - + - + + Layer parameters @@ -45,9 +46,10 @@ - + + + MPGD DIRC module components - MPGD DIRC module components + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + vis="TrackerVis" + offset="MPGDOuterBarrelModule_feb_ext" + length="MPGDOuterBarrelModule_length"/> Frame width gets subtracted from the gas module volumes see src/BarrelPlanarMPGDTracker_geo.cpp @@ -139,9 +142,10 @@ thickness="MPGDOuterBarrelFrame_thickness"/> + Layout for MPGD DIRC layers - + Date: Fri, 5 Sep 2025 10:57:35 -0400 Subject: [PATCH 05/17] update bot geo --- src/BarrelPlanarMPGDTracker_geo.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 23231b8cbb..4ac173de0b 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -52,6 +52,8 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, dd4hep::xml::Dimension dimensions(x_det.dimensions()); xml_dim_t mpgd_pos = x_det.position(); Assembly assembly(det_name); + + double pcb_feb_ext = 0.0; //extension of PCB board to hold FEBs. // Set detector type flag dd4hep::xml::setDetectorTypeFlag(x_det, sdet); @@ -159,7 +161,12 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, c_vol.setLimitSet(description, x_comp.limitsStr()); c_vol.setVisAttributes(description, x_comp.visStr()); + if(comp_name == "PCB") { + pcb_feb_ext = x_comp.offset(); + pv = m_vol.placeVolume(c_vol, Position(0,-pcb_feb_ext/2.0, thickness_sum + x_comp.thickness() / 2.0)); + }else { pv = m_vol.placeVolume(c_vol, Position(0, 0, thickness_sum + x_comp.thickness() / 2.0)); + } if (x_comp.isSensitive()) { pv.addPhysVolID("sensor", sensor_number++); @@ -283,14 +290,15 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, string module_name = _toString(module, "module%d"); DetElement mod_elt(lay_elt, module_name, module); double mod_z = 0.5 * dimensions.length(); - double z_placement = mod_z - j * nz * mod_z; // z location for module placement + double z_placement = mod_z - 0.5*pcb_feb_ext - j *( nz * mod_z - pcb_feb_ext); // z location for module placement double z_offset = z_placement > 0 ? -z0 / 2.0 : z0 / 2.0; // determine the amount of overlap in z the z nz modules have - Transform3D tr(RotationZYX(0.0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2), - Position(xc, yc, mpgd_pos.z() + z_placement + z_offset)); // in x-y plane, + Transform3D tr(RotationZYX(0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2)*RotationZ(j*M_PI), + Position(xc, yc, mpgd_pos.z() + z_placement + z_offset)); //RotZYX rotat planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps + pv = layer_assembly.placeVolume(module_env, tr); pv.addPhysVolID("module", module); mod_elt.setPlacement(pv); From 2518dc213033a089c1604f8075e620f160ece5cb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 14:59:35 +0000 Subject: [PATCH 06/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- compact/tracking/mpgd_outerbarrel.xml | 8 ++++---- src/BarrelPlanarMPGDTracker_geo.cpp | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index 6bd092ba51..1296be4b69 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -46,7 +46,7 @@ - + MPGD DIRC module components @@ -128,9 +128,9 @@ sensitive="false" width="MPGDOuterBarrelModule_width" thickness="MPGDOuterBarrelPCB_thickness" - vis="TrackerVis" + vis="TrackerVis" offset="MPGDOuterBarrelModule_feb_ext" - length="MPGDOuterBarrelModule_length"/> + length="MPGDOuterBarrelModule_length"/> Frame width gets subtracted from the gas module volumes see src/BarrelPlanarMPGDTracker_geo.cpp @@ -142,7 +142,7 @@ thickness="MPGDOuterBarrelFrame_thickness"/> - + Layout for MPGD DIRC layers diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 4ac173de0b..a05a04abfb 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -52,8 +52,8 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, dd4hep::xml::Dimension dimensions(x_det.dimensions()); xml_dim_t mpgd_pos = x_det.position(); Assembly assembly(det_name); - - double pcb_feb_ext = 0.0; //extension of PCB board to hold FEBs. + + double pcb_feb_ext = 0.0; //extension of PCB board to hold FEBs. // Set detector type flag dd4hep::xml::setDetectorTypeFlag(x_det, sdet); @@ -161,11 +161,12 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, c_vol.setLimitSet(description, x_comp.limitsStr()); c_vol.setVisAttributes(description, x_comp.visStr()); - if(comp_name == "PCB") { - pcb_feb_ext = x_comp.offset(); - pv = m_vol.placeVolume(c_vol, Position(0,-pcb_feb_ext/2.0, thickness_sum + x_comp.thickness() / 2.0)); - }else { - pv = m_vol.placeVolume(c_vol, Position(0, 0, thickness_sum + x_comp.thickness() / 2.0)); + if (comp_name == "PCB") { + pcb_feb_ext = x_comp.offset(); + pv = m_vol.placeVolume( + c_vol, Position(0, -pcb_feb_ext / 2.0, thickness_sum + x_comp.thickness() / 2.0)); + } else { + pv = m_vol.placeVolume(c_vol, Position(0, 0, thickness_sum + x_comp.thickness() / 2.0)); } if (x_comp.isSensitive()) { @@ -290,14 +291,19 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, string module_name = _toString(module, "module%d"); DetElement mod_elt(lay_elt, module_name, module); double mod_z = 0.5 * dimensions.length(); - double z_placement = mod_z - 0.5*pcb_feb_ext - j *( nz * mod_z - pcb_feb_ext); // z location for module placement + double z_placement = mod_z - 0.5 * pcb_feb_ext - + j * (nz * mod_z - pcb_feb_ext); // z location for module placement double z_offset = z_placement > 0 ? -z0 / 2.0 : z0 / 2.0; // determine the amount of overlap in z the z nz modules have - Transform3D tr(RotationZYX(0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2)*RotationZ(j*M_PI), - Position(xc, yc, mpgd_pos.z() + z_placement + z_offset)); //RotZYX rotat planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps + Transform3D tr( + RotationZYX(0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2) * RotationZ(j * M_PI), + Position( + xc, yc, + mpgd_pos.z() + z_placement + + z_offset)); //RotZYX rotat planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps pv = layer_assembly.placeVolume(module_env, tr); pv.addPhysVolID("module", module); From 48c803b112cec5b3fa68df41f5ea916f93b30122 Mon Sep 17 00:00:00 2001 From: Matt Posik Date: Wed, 10 Sep 2025 08:54:25 -0400 Subject: [PATCH 07/17] Update mpgd_outerbarrel.xml remove indentation --- compact/tracking/mpgd_outerbarrel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index 1296be4b69..9db18856ab 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -46,7 +46,7 @@ - + MPGD DIRC module components From edbc56c5bca400a2794fdaa7e3eedaca5ea8abd9 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Thu, 11 Sep 2025 12:17:11 -0400 Subject: [PATCH 08/17] address review comments --- compact/tracking/mpgd_barrel.xml | 2 +- compact/tracking/mpgd_outerbarrel.xml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compact/tracking/mpgd_barrel.xml b/compact/tracking/mpgd_barrel.xml index 433ccf0b91..78eeb4f1a4 100644 --- a/compact/tracking/mpgd_barrel.xml +++ b/compact/tracking/mpgd_barrel.xml @@ -52,7 +52,7 @@ In principle, stave count should not be independenty specified: it is fixed by above intrinsic parameters - 1.3cm is to make envelope match CAD drawings + Factor of 1.3cm on InnerMPGDBarrelLayer_rmax is to extend radial envelope to match 03-12-2025 CAD envelope diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index 9db18856ab..f1b68f1b36 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -26,8 +26,8 @@ - - + + Layer parameters @@ -58,7 +58,7 @@ width="MPGDOuterBarrelModule_width" thickness="MPGDOuterBarrelDriftGap_thickness" vis="TrackerMPGDGasVis" - length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_feb_ext"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> + length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> Frame width gets subtracted from the gas module volumes From c64477e7601c917573668315084ad55b1bc9e749 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Tue, 16 Sep 2025 08:39:40 -0400 Subject: [PATCH 09/17] Remove "magic" number --- compact/tracking/definitions_craterlake.xml | 1 + compact/tracking/mpgd_barrel.xml | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml index f38a7ae3e3..5684d570c4 100644 --- a/compact/tracking/definitions_craterlake.xml +++ b/compact/tracking/definitions_craterlake.xml @@ -33,6 +33,7 @@ Inner MPGD unsegmented barrel + negative z positive z diff --git a/compact/tracking/mpgd_barrel.xml b/compact/tracking/mpgd_barrel.xml index 78eeb4f1a4..5060cc7402 100644 --- a/compact/tracking/mpgd_barrel.xml +++ b/compact/tracking/mpgd_barrel.xml @@ -52,10 +52,7 @@ In principle, stave count should not be independenty specified: it is fixed by above intrinsic parameters - Factor of 1.3cm on InnerMPGDBarrelLayer_rmax is to extend radial envelope to match 03-12-2025 CAD envelope - - @@ -101,8 +98,8 @@ From 62ad2d920e31730d34c0b05c9298a32e1d7c8f65 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Fri, 19 Sep 2025 08:35:47 -0400 Subject: [PATCH 10/17] Clean code for z placement --- compact/tracking/mpgd_outerbarrel.xml | 12 +++++++++++- src/BarrelPlanarMPGDTracker_geo.cpp | 10 +++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index f1b68f1b36..05703fba00 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -58,6 +58,7 @@ width="MPGDOuterBarrelModule_width" thickness="MPGDOuterBarrelDriftGap_thickness" vis="TrackerMPGDGasVis" + offset="0" length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> Frame width gets subtracted from the gas module volumes diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index a05a04abfb..4dc624ca47 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -161,13 +161,9 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, c_vol.setLimitSet(description, x_comp.limitsStr()); c_vol.setVisAttributes(description, x_comp.visStr()); - if (comp_name == "PCB") { - pcb_feb_ext = x_comp.offset(); - pv = m_vol.placeVolume( - c_vol, Position(0, -pcb_feb_ext / 2.0, thickness_sum + x_comp.thickness() / 2.0)); - } else { - pv = m_vol.placeVolume(c_vol, Position(0, 0, thickness_sum + x_comp.thickness() / 2.0)); - } + pcb_feb_ext = x_comp.offset(); + + pv = m_vol.placeVolume(c_vol, Position(0, -pcb_feb_ext / 2.0, thickness_sum + x_comp.thickness() / 2.0)); if (x_comp.isSensitive()) { pv.addPhysVolID("sensor", sensor_number++); From 23bb2d263caa34f08e13d4638a3ee98642e78671 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:38:30 +0000 Subject: [PATCH 11/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- compact/tracking/mpgd_outerbarrel.xml | 22 +++++++++++----------- src/BarrelPlanarMPGDTracker_geo.cpp | 5 +++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index 05703fba00..62114a3208 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -58,7 +58,7 @@ width="MPGDOuterBarrelModule_width" thickness="MPGDOuterBarrelDriftGap_thickness" vis="TrackerMPGDGasVis" - offset="0" + offset="0" length="MPGDOuterBarrelModule_length - MPGDOuterBarrelModule_PCB_offset"/> Frame width gets subtracted from the gas module volumes diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 4dc624ca47..14594cbb66 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -162,8 +162,9 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, c_vol.setVisAttributes(description, x_comp.visStr()); pcb_feb_ext = x_comp.offset(); - - pv = m_vol.placeVolume(c_vol, Position(0, -pcb_feb_ext / 2.0, thickness_sum + x_comp.thickness() / 2.0)); + + pv = m_vol.placeVolume( + c_vol, Position(0, -pcb_feb_ext / 2.0, thickness_sum + x_comp.thickness() / 2.0)); if (x_comp.isSensitive()) { pv.addPhysVolID("sensor", sensor_number++); From de51d8e5ccd924bab92d691e42b4204983ad016e Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Fri, 19 Sep 2025 10:13:52 -0400 Subject: [PATCH 12/17] fix comment spelling error --- src/BarrelPlanarMPGDTracker_geo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 14594cbb66..f0a329d565 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -300,7 +300,7 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, Position( xc, yc, mpgd_pos.z() + z_placement + - z_offset)); //RotZYX rotat planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps + z_offset)); //RotZYX rotates planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps pv = layer_assembly.placeVolume(module_env, tr); pv.addPhysVolID("module", module); From d4f2659a21006532f6f5d7d0d05ca3d234590b03 Mon Sep 17 00:00:00 2001 From: Matthew Posik Date: Fri, 19 Sep 2025 10:56:10 -0400 Subject: [PATCH 13/17] fix number of modules --- compact/tracking/mpgd_outerbarrel.xml | 3 +-- src/BarrelPlanarMPGDTracker_geo.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compact/tracking/mpgd_outerbarrel.xml b/compact/tracking/mpgd_outerbarrel.xml index 62114a3208..2c2933dfe4 100644 --- a/compact/tracking/mpgd_outerbarrel.xml +++ b/compact/tracking/mpgd_outerbarrel.xml @@ -166,8 +166,7 @@ dr="0" /> + z0 = "MPGDOuterBarrelModule_zoverlap"/> diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index f0a329d565..e00c699641 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -261,7 +261,8 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, double rphi_dr = x_layout.dr(); // The delta radius of every other module double phi_incr = (2 * M_PI) / nphi; // Phi increment for one module double phic = phi0; // Phi of the module - double nz = z_layout.nz(); // Number of modules placed in z + //double nz = z_layout.nz(); // Number of modules placed in z + int nz = 2; // Number of modules placed in z double z_dr = z_layout.dr(); // Radial offest of modules in z double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have From 3fc786c16de1872813e083929145ccc9820ab128 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:57:13 +0000 Subject: [PATCH 14/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/BarrelPlanarMPGDTracker_geo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index e00c699641..f36a204ed9 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -262,9 +262,9 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, double phi_incr = (2 * M_PI) / nphi; // Phi increment for one module double phic = phi0; // Phi of the module //double nz = z_layout.nz(); // Number of modules placed in z - int nz = 2; // Number of modules placed in z - double z_dr = z_layout.dr(); // Radial offest of modules in z - double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have + int nz = 2; // Number of modules placed in z + double z_dr = z_layout.dr(); // Radial offest of modules in z + double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have Assembly layer_assembly(lay_nam); Volume module_env = volumes[m_nam]; From 75b04097a837b50885e891e0831b9bc109329e30 Mon Sep 17 00:00:00 2001 From: Matt Posik Date: Fri, 19 Sep 2025 11:00:49 -0400 Subject: [PATCH 15/17] remove comment --- src/BarrelPlanarMPGDTracker_geo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index f36a204ed9..9f3df3b8f5 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -261,7 +261,6 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, double rphi_dr = x_layout.dr(); // The delta radius of every other module double phi_incr = (2 * M_PI) / nphi; // Phi increment for one module double phic = phi0; // Phi of the module - //double nz = z_layout.nz(); // Number of modules placed in z int nz = 2; // Number of modules placed in z double z_dr = z_layout.dr(); // Radial offest of modules in z double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have From f9612e1ce3877dba60471ee6cebdb61ed824e95f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:01:05 +0000 Subject: [PATCH 16/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/BarrelPlanarMPGDTracker_geo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 9f3df3b8f5..077a853c59 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -261,9 +261,9 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, double rphi_dr = x_layout.dr(); // The delta radius of every other module double phi_incr = (2 * M_PI) / nphi; // Phi increment for one module double phic = phi0; // Phi of the module - int nz = 2; // Number of modules placed in z - double z_dr = z_layout.dr(); // Radial offest of modules in z - double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have + int nz = 2; // Number of modules placed in z + double z_dr = z_layout.dr(); // Radial offest of modules in z + double z0 = z_layout.z0(); // Sets how much overlap in z the nz modules have Assembly layer_assembly(lay_nam); Volume module_env = volumes[m_nam]; From 8b53c18c4e2554814d7393d1a523268a8b102ad8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 19 Sep 2025 23:28:41 -0400 Subject: [PATCH 17/17] Update src/BarrelPlanarMPGDTracker_geo.cpp --- src/BarrelPlanarMPGDTracker_geo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BarrelPlanarMPGDTracker_geo.cpp b/src/BarrelPlanarMPGDTracker_geo.cpp index 077a853c59..1e13bf7c0b 100644 --- a/src/BarrelPlanarMPGDTracker_geo.cpp +++ b/src/BarrelPlanarMPGDTracker_geo.cpp @@ -300,7 +300,7 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e, Position( xc, yc, mpgd_pos.z() + z_placement + - z_offset)); //RotZYX rotates planes around azimuth, RotZ flip plane so pcb_feb_ext is faceing endcaps + z_offset)); //RotZYX rotates planes around azimuth, RotZ flips plane so pcb_feb_ext is facing endcaps pv = layer_assembly.placeVolume(module_env, tr); pv.addPhysVolID("module", module);