Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions compact/tracking/definitions_craterlake.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<constant name="TrackerEndcapDisk_rmax" value="43*cm"/>

<comment> Main parameters for the outer MPGD barrel layer </comment>
<constant name="MPGDOuterBarrelModule_rmin" value="735*mm"/>
<constant name="MPGDOuterBarrelModule_zmin1" value="1795*mm"/>
<constant name="MPGDOuterBarrelModule_zmin2" value="1845*mm"/>
<constant name="MPGDOuterBarrelModule_rmin" value="730*mm"/>
<constant name="MPGDOuterBarrelModule_zmin1" value="1925*mm"/> <comment> negative z </comment>
<constant name="MPGDOuterBarrelModule_zmin2" value="1675*mm"/> <comment> positive z </comment>

<comment> Inner MPGD unsegmented barrel </comment>
<constant name="InnerMPGDBarrel_rmin" value="550*mm"/>
<constant name="InnerMPGDBarrel_rmax" value="605*mm"/>
<constant name="InnerMPGDBarrel_rmin" value="555*mm"/>
<constant name="InnerMPGDBarrel_rmax" value="615*mm"/>
<constant name="InnerMPGDBarrel_dz" value="0"/>
<constant name="InnerMPGDBarrel_zmin" value="1025*mm"/> <comment> negative z </comment>
<constant name="InnerMPGDBarrel_zmax" value="1450*mm"/> <comment> positive z </comment>
Expand Down Expand Up @@ -106,19 +106,21 @@
<constant name="TrackerEndcapNDisk4_rmax" value="TrackerEndcapPDisk4_rmax" />

<comment> Main parameters for MPGD endcap disks, offset here is the distance between disks </comment>
<constant name="ForwardMPGD_zmin" value="1500.0*mm"/>
<constant name="ForwardMPGD_zmin" value="1285.0*mm"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could overlap with the silicon disk, check TrackerEndcapPDisk4_zmin

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it passed the overlap checks in CI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ShujieL, I ran checkOverlaps script with tolerance set to -t 0.001 in the tracking_only configuration and the only overlaps I saw were from other sub detectors (non-mpgd) overlapping with themselves or beampipe.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well technically there is no "overlap", but check this:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, that fit nicely in there. How should we proceed in updating the geometry to match the Sep. CAD model? Should we have this PR serve as the Tracking geometry update PR, so silicon and ToF can include their respective changes in this PR and then merge when the tracking system update is completed?

<constant name="ForwardMPGDMod_offset" value="125.0*mm"/>
<constant name="ForwardMPGDMod1_rmin" value="81.24*mm" />
<constant name="ForwardMPGDMod2_rmin" value="81.24*mm"/>
<constant name="ForwardMPGDMod1_rmax" value="400*mm" />
<constant name="ForwardMPGDMod2_rmax" value="400*mm" />
<constant name="ForwardMPGDMod1_rmin" value="70.0*mm" />
<constant name="ForwardMPGDMod2_rmin" value="70.0*mm"/>
<comment> rmax = active area radius </comment>
<constant name="ForwardMPGDMod1_rmax" value="420*mm" />
<constant name="ForwardMPGDMod2_rmax" value="420*mm" />

<constant name="BackwardMPGD_zmin" value="1075.0*mm"/>
<constant name="BackwardMPGDMod_offset" value="125.0*mm"/>
<constant name="BackwardMPGDMod1_rmin" value="70.0*mm" />
<constant name="BackwardMPGDMod2_rmin" value="70.0*mm" />
<constant name="BackwardMPGDMod1_rmax" value="400.0*mm" />
<constant name="BackwardMPGDMod2_rmax" value="400.0*mm" />
<constant name="BackwardMPGDMod1_rmin" value="50.0*mm" />
<constant name="BackwardMPGDMod2_rmin" value="50.0*mm" />
<comment> rmax = active area radius </comment>
<constant name="BackwardMPGDMod1_rmax" value="420.0*mm" />
<constant name="BackwardMPGDMod2_rmax" value="420.0*mm" />

</define>
<comment> See compact/definitions.xml for reserved detector id
Expand Down
4 changes: 2 additions & 2 deletions compact/tracking/mpgd_outerbarrel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<constant name="MPGDOuterBarrelModule_roverlap" value="0*cm"/>
<constant name="MPGDOuterBarrelModule_zoverlap" value="0*MPGDOuterBarrelFrame_width"/>
<constant name="MPGDOuterBarrelModule_count" value="12" />
<constant name="MPGDOuterBarrelModule_allowed_space" value="25*mm"/>
<constant name="MPGDOuterBarrelModule_allowed_space" value="15*mm"/>
<constant name="MPGDOuterBarrelModule_rmax" value="MPGDOuterBarrelModule_rmin + MPGDOuterBarrelModule_allowed_space" />
<constant name="MPGDOuterBarrelModule_roffset" value="0.5*cm" />
<constant name="MPGDOuterBarrelModule_width" value="360*mm"/>
<constant name="MPGDOuterBarrel_length" value="MPGDOuterBarrelModule_zmin1 + MPGDOuterBarrelModule_zmin2"/>
<constant name="MPGDOuterBarrelModule_length" value="0.5*(MPGDOuterBarrelModule_zmin1 + MPGDOuterBarrelModule_zmin2 + MPGDOuterBarrelModule_zoverlap)"/>
<constant name="MPGDOuterBarrelModule_offset" value="0.5*(MPGDOuterBarrelModule_zmin2 - MPGDOuterBarrelModule_zmin1)"/>
<constant name="MPGDOuterBarrelModule_PCB_offset" value="110*mm"/>
<constant name="MPGDOuterBarrelModule_PCB_offset" value="110*mm"/>
<constant name="MPGDOuterStrip_range" value="(MPGDOuterBarrelModule_length + MPGDOuterBarrelModule_width)/2.0*sqrt(2)"/>

<comment> Layer parameters </comment>
Expand Down
Loading