diff --git a/topside/topside_defs.xml b/topside/topside_defs.xml
index 5cee67c5671ac5bc58a7a121d2fb03794166d791..67b8717c096197450ca6764abbd43bd9f2bddb0d 100644
--- a/topside/topside_defs.xml
+++ b/topside/topside_defs.xml
@@ -230,21 +230,6 @@
=====================================
</comment>
-
-
- <comment>
- For reference, here are the sPhenix solenoid and calorimeter Parameters.
- </comment>
- <constant name="sPhenixCoilInnerRadius" value="1420.0*mm"/>
- <constant name="sPhenixCoilOuterRadius" value="1800.0*mm"/><!-- guestimate -->
- <constant name="sPhenixCoilLength" value="4050.0*mm"/> <!-- guestimate -->
- <constant name="sPhenixEMCalInnerRadius" value="890.00*mm"/>
- <constant name="sPhenixEMCalOuterRadius" value="1155.8*mm"/>
- <constant name="sPhenixEMCalLength" value="1727.2*2*mm"/>
- <constant name="sPhenixInnerHCalInnerRadius" value="sPhenixEMCalOuterRadius - 1.0*cm"/> <!-- guestimate -->
- <constant name="sPhenixInnerHCalOuterRadius" value="1370.0*mm"/>
- <constant name="sPhenixInnerHCalLength" value="2175*2*mm"/>
-
<comment>
--------------------------
Solenoid Magnet Parameters
@@ -294,16 +279,23 @@
<constant name="SolenoidYokeChamferAngle" value="0.2"/>
+ <comment>
+ ============================
+ Tracking Parameters
+ ============================
+ </comment>
+ <constant name="tracker_region_rmax" value="Solenoid_rmax/2.0"/>
+ <constant name="tracker_region_zmax" value="SolenoidLength/2.0"/>
+
<comment>
-------------------------
Vertex Tracker Parameters
-------------------------
</comment>
<constant name="VertexTrackerInnerRadius" value="30.0*mm"/>
- <constant name="VertexTrackerOuterRadius" value="90.0*mm"/>
+ <constant name="VertexTrackerOuterRadius" value="Solenoid_rmin/2.0"/>
<constant name="VertexTrackerOuterBarrelLength" value="300.0*mm"/>
- <constant name="tracker_region_rmax" value="Solenoid_rmax"/>
- <constant name="tracker_region_zmax" value="SolenoidLength/2.0"/>
+
<comment>
--------------------------
@@ -312,8 +304,8 @@
</comment>
<constant name="SiliconTrackerInnerRadius" value="95.0*mm"/>
<constant name="SiliconTrackerInnerBarrelLength" value="400.0*mm"/>
- <constant name="SiliconTrackerOuterRadius" value="860.0*mm"/>
- <constant name="SiliconTrackerOuterBarrelLength" value="SiliconTrackerOuterRadius*2"/>
+ <constant name="SiliconTrackerOuterRadius" value="Solenoid_rmax/2.0"/>
+ <constant name="SiliconTrackerOuterBarrelLength" value="SolenoidLength/2.0"/>
<comment>
------------
@@ -323,7 +315,7 @@
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + 3.0 * cm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 5.0 *cm "/>
<constant name="AvailTotalBarrelCalorimetryThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
- <constant name="CalBarrelDivider" value="0.5"/> <!-- Ecal and Hcal have the same thickness -->
+ <constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
<constant name="EcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * CalBarrelDivider"/>
<constant name="HcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * (1.0 - CalBarrelDivider)"/>
@@ -331,10 +323,11 @@
<constant name="EcalEndcap_zmin" value="EcalBarrelLength/2.0"/>
<constant name="AvailTotalEndcapCalorimetryThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - (EcalEndcap_zmin + 10.0 * mm)"/>
- <constant name="CalEndcapDivider" value="0.5"/> <!-- Ecal and Hcal have the same thickness -->
+ <constant name="CalEndcapDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
<constant name="EcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * CalEndcapDivider"/>
<constant name="HcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * (1.0 - CalEndcapDivider)"/>
+ <comment> These need to be set in sync with the forward and backward detectors </comment>
<constant name="EcalEndcapP_rmin" value="250.0*mm"/>
<constant name="EcalEndcapN_rmin" value="350.0*mm"/>
@@ -348,7 +341,7 @@
</comment>
<constant name="CaloSides" value="12"/>
- <!-- Material Thickness -->
+ <comment>Material Thickness</comment>
<constant name="EcalSiliconThickness" value="9.00 * mm"/>
<constant name="EcalCopperThickness" value="0.05 * mm"/>
<constant name="EcalKaptonThickness" value="0.30 * mm"/>
@@ -357,7 +350,7 @@
<constant name="EcalThinTungstenThickness" value="2.50 * mm"/>
<constant name="EcalThickTungstenThickness" value="5.00 * mm"/>
- <!-- Layer Thickness -->
+ <comment> Layer Thickness </comment>
<constant name="EcalFirstLayerThickness"
value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThinOneLayerThickness"
@@ -365,22 +358,22 @@
<constant name="EcalThickOneLayerThickness"
value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
- <!-- EM Barrel N Layer; same number of layers for EcalThin and EcalThick -->
+ <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
<constant name="EcalBarrelLayers"
value="floor((EcalBarrelAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/>
<constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/>
- <!-- EM Barrel Thickness -->
+ <comment> EM Barrel Thickness </comment>
<constant name="EcalBarrelThickness"
value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
<constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/>
- <!-- EM Endcap N Layer; same number of layers for EcalThin and EcalThick -->
+ <comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
<constant name="EcalEndcapLayers"
value="floor((EcalEndcapAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalEndcapThinLayers" value="EcalEndcapLayers"/>
<constant name="EcalEndcapThickLayers" value="EcalEndcapLayers"/>
- <!-- EM Endcap Thickness -->
+ <comment> EM Endcap Thickness </comment>
<constant name="EcalEndcapThickness"
value="EcalFirstLayerThickness + (EcalEndcapThinLayers * EcalThinOneLayerThickness) + (EcalEndcapThickLayers * EcalThickOneLayerThickness)"/>
@@ -395,22 +388,22 @@
<constant name="HcalEndcap_zmin" value="HcalBarrelLength/2.0"/>
<constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/>
- <!-- Material Thickness -->
+ <comment> Material Thickness </comment>
<constant name="HcalSteelThickness" value="1.89 * cm"/>
<constant name="HcalPyrexThickness" value="1.10 * mm"/>
<constant name="HcalRPCGasThickness" value="1.20 * mm"/>
<constant name="HcalG10Thickness" value="3.00 * mm"/>
<constant name="HcalAirThickness" value="1.60 * mm"/>
- <!-- Layer Thickness -->
+ <comment> Layer Thickness </comment>
<constant name="HcalOneLayerThickness"
value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
- <!-- H Barrel Layers and Thickness -->
+ <comment> H Barrel Layers and Thickness </comment>
<constant name="HcalBarrelLayers" value="floor(HcalBarrelAvailThickness / HcalOneLayerThickness)"/>
<constant name="HcalBarrelThickness" value="HcalBarrelLayers * HcalOneLayerThickness"/>
- <!-- H Endcap Layers and Thickness -->
+ <comment> H Endcap Layers and Thickness </comment>
<constant name="HcalEndcapLayers" value="floor(HcalEndcapAvailThickness / HcalOneLayerThickness)"/>
<constant name="HcalEndcapThickness" value="HcalEndcapLayers * HcalOneLayerThickness"/>
@@ -451,11 +444,6 @@
--------------------------
</comment>
- <comment>
- For DDsim. See ddsim --help for details.
- </comment>
- <constant name="tracker_region_zmax" value="SiliconTrackerOuterBarrelLength/2.0"/>
- <constant name="tracker_region_rmax" value="SiliconTrackerOuterRadius"/>