Mpgd disks parameter table update (#593)

### Briefly, what does this PR introduce?
Updates MPGD disks to match detector parameter table

### What kind of change does this PR introduce?
- [x] Bug fix (issue #567 )
- [ ] New feature (issue #__)
- [] Documentation update
- [ ] Other: __

### Please check if this PR fulfills the following:
- [ ] Tests for the changes have been added
- [ ] Documentation has been added / updated
- [ x] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
There should be no breaking changes 

### Does this PR change default behavior?
No

compact/tracking/mpgd_backward_endcap.xml

@@ -51,8 +51,8 @@
     <constant name="BackwardMPGDLayer2_rmin"       value="BackwardMPGDMod2_rmin - BackwardMPGDLayerPad" />
     <constant name="BackwardMPGDLayer1_rmax"       value="BackwardMPGDMod1_rmax + BackwardMPGDLayerPad" />
     <constant name="BackwardMPGDLayer2_rmax"       value="BackwardMPGDMod2_rmax + BackwardMPGDLayerPad" />
-    <constant name="BackwardMPGDLayer1_zmin"       value="BackwardMPGDMod1_zmin - BackwardMPGDEndcapLayer_thickness / 2" />
-    <constant name="BackwardMPGDLayer2_zmin"       value="BackwardMPGDMod2_zmin - BackwardMPGDEndcapLayer_thickness / 2" />
+    <constant name="BackwardMPGDLayer1_zmin"       value="BackwardMPGDMod1_zmin - BackwardMPGDLayerPad" />
+    <constant name="BackwardMPGDLayer2_zmin"       value="BackwardMPGDMod2_zmin + BackwardMPGDLayerPad" />
 
     <constant name="BackwardMPGDMod1_x1"           value="2 * BackwardMPGDMod1_rmin * tan(BackwardMPGDEndcapMod_angle/2)" />
     <constant name="BackwardMPGDMod1_x2"           value="2 * BackwardMPGDMod1_rmax * sin(BackwardMPGDEndcapMod_angle/2)" />

compact/tracking/mpgd_forward_endcap.xml

@@ -51,8 +51,8 @@
     <constant name="ForwardMPGDLayer2_rmin"       value="ForwardMPGDMod2_rmin - ForwardMPGDLayerPad" />
     <constant name="ForwardMPGDLayer1_rmax"       value="ForwardMPGDMod1_rmax + ForwardMPGDLayerPad" />
     <constant name="ForwardMPGDLayer2_rmax"       value="ForwardMPGDMod2_rmax + ForwardMPGDLayerPad" />
-    <constant name="ForwardMPGDLayer1_zmin"       value="ForwardMPGDMod1_zmin - ForwardMPGDEndcapLayer_thickness / 2" />
-    <constant name="ForwardMPGDLayer2_zmin"       value="ForwardMPGDMod2_zmin - ForwardMPGDEndcapLayer_thickness / 2" />
+    <constant name="ForwardMPGDLayer1_zmin"       value="ForwardMPGDMod1_zmin - ForwardMPGDLayerPad" />
+    <constant name="ForwardMPGDLayer2_zmin"       value="ForwardMPGDMod2_zmin + ForwardMPGDLayerPad" />
 
     <constant name="ForwardMPGDMod1_x1"           value="2 * ForwardMPGDMod1_rmin * tan(ForwardMPGDEndcapMod_angle/2)" />
     <constant name="ForwardMPGDMod1_x2"           value="2 * ForwardMPGDMod1_rmax * sin(ForwardMPGDEndcapMod_angle/2)" />

templates/DetectorParameterTable.csv.jinja2

@@ -32,8 +32,8 @@ CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,DIRC Readout Support,{{DIRCReadou
 CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,DIRC Bar Box,{{DIRCBar_length}},,,,,
 CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,Inner MPGD,,,,,,
 CENTRAL DETECTOR,Barrel Time of Flight/Tracker,,{{BarrelTOF_length}},{{BarrelTOF_rmin}},{{BarrelTOF_rmax}},,,
-CENTRAL DETECTOR,HD MPGD 2,,,{{ForwardMPGDLayer2_rmin}},{{ForwardMPGDLayer2_rmax}},,{{ForwardMPGDLayer2_zmin}},{{ForwardMPGDLayer2_zmin+ForwardMPGDEndcapLayer_thickness}}
-CENTRAL DETECTOR,HD MPGD 1,,,{{ForwardMPGDLayer1_rmin}},{{ForwardMPGDLayer1_rmax}},,{{ForwardMPGDLayer1_zmin}},{{ForwardMPGDLayer1_zmin+ForwardMPGDEndcapLayer_thickness}}
+CENTRAL DETECTOR,HD MPGD 2,,{{ForwardMPGD_AllowedSpace}},{{ForwardMPGDLayer2_rmin}},{{ForwardMPGDLayer2_rmax}},{{ForwardMPGDLayer2_zmin}},{{ForwardMPGDLayer2_zmin}},{{ForwardMPGDLayer2_zmin+ForwardMPGD_AllowedSpace}}
+CENTRAL DETECTOR,HD MPGD 1,,{{ForwardMPGD_AllowedSpace}},{{ForwardMPGDLayer1_rmin}},{{ForwardMPGDLayer1_rmax}},{{ForwardMPGDLayer1_zmin}},{{ForwardMPGDLayer1_zmin}},{{ForwardMPGDLayer1_zmin+ForwardMPGD_AllowedSpace}}
 CENTRAL DETECTOR,Inner Tracker (Micromegas),,,,,,,
 CENTRAL DETECTOR,Inner Tracker (Micromegas),Micromega 1,,,,,,
 CENTRAL DETECTOR,Inner Tracker (Micromegas),Micromega 2,,,,,,
@@ -57,8 +57,8 @@ CENTRAL DETECTOR,Inner Tracker (Si Disks),LD Disk 2,,{{TrackerEndcapNLayer1_rmin
 CENTRAL DETECTOR,Inner Tracker (Si Disks),LD Disk 3,,{{TrackerEndcapNLayer2_rmin}},{{TrackerEndcapNLayer2_rmax}},,-{{TrackerEndcapNLayer2_zmin+SiTrackerEndcapLayer_thickness}},-{{TrackerEndcapNLayer2_zmin}}
 CENTRAL DETECTOR,Inner Tracker (Si Disks),LD Disk 4,,{{TrackerEndcapNLayer3_rmin}},{{TrackerEndcapNLayer3_rmax}},,-{{TrackerEndcapNLayer3_zmin+SiTrackerEndcapLayer_thickness}},-{{TrackerEndcapNLayer3_zmin}}
 CENTRAL DETECTOR,Inner Tracker (Si Disks),LD Disk 5,,{{TrackerEndcapNLayer4_rmin}},{{TrackerEndcapNLayer4_rmax}},,-{{TrackerEndcapNLayer4_zmin+SiTrackerEndcapLayer_thickness}},-{{TrackerEndcapNLayer4_zmin}}
-CENTRAL DETECTOR,LD MPGD 1,,,{{BackwardMPGDMod1_rmin}},{{BackwardMPGDMod1_rmax}},,-{{BackwardMPGD_zmin}},
-CENTRAL DETECTOR,LD MPGD 2,,,{{BackwardMPGDMod2_rmin}},{{BackwardMPGDMod2_rmax}},,-{{BackwardMPGD_zmin+BackwardMPGDMod_offset}},
+CENTRAL DETECTOR,LD MPGD 1,,{{BackwardMPGD_AllowedSpace}},{{BackwardMPGDLayer1_rmin}},{{BackwardMPGDLayer1_rmax}},-{{BackwardMPGDLayer1_zmin}},-{{BackwardMPGDLayer1_zmin+BackwardMPGD_AllowedSpace}},-{{BackwardMPGDLayer1_zmin}}
+CENTRAL DETECTOR,LD MPGD 2,,{{BackwardMPGD_AllowedSpace}},{{BackwardMPGDLayer2_rmin}},{{BackwardMPGDLayer2_rmax}},-{{BackwardMPGDLayer2_zmin}},-{{BackwardMPGDLayer2_zmin+BackwardMPGD_AllowedSpace}},-{{BackwardMPGDLayer2_zmin}}
 CENTRAL DETECTOR,Proximity Focusing RICH,,{{PFRICH_length}},{{PFRICH_rmin0}},{{PFRICH_rmax}},,{{PFRICH_zmin}},{{PFRICH_zmin-PFRICH_length}}
 CENTRAL DETECTOR,LD EMCal,,{{EcalEndcapN_length}},{{EcalEndcapN_rmin}},{{EcalEndcapN_rmax}},,-{{EcalEndcapN_zmax}},-{{EcalEndcapN_zmin}}
 CENTRAL DETECTOR,Service Gap,,,,,,-{{BackwardServiceGap_zmax+BackwardServiceGap_length}},-{{BackwardServiceGap_zmax}}