modified: compact/definitions.xml

	modified:   compact/solenoid.xml

compact/definitions.xml

@@ -242,6 +242,18 @@
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       Detector Definition Parameters 
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+      ## Parameter nomenclature
+
+       - "rmin", "rmax", "thickness" all refer to the radial direction.
+       - "zmin", "zmax", "length", "offset" all refer to the z direction.
+       - Positive and Negative are  "EndcapP" and "EndcapN", respectively.
+       - All values are positive. When refering to a negative endcap z position, the values are
+           also positive then negated when required. (Many endcap constructions are mirrored, 
+           hence a postive value.
+       - We will try to keep the subsystem component name first and the parameter after an "_" (eg, EcalBarrel_length").
+           TODO: fix parameter naming to be uniform in the above convention.
+
     </comment>
 
     <comment>
@@ -249,15 +261,12 @@
       Solenoid Magnet Parameters
       ==========================
     </comment>
-    <constant name="cb_Solenoid_rmin"  value="0.0 * cm"/>   <comment> Central Barrel Solenoid Inner diameter </comment>
-    <constant name="cb_Solenoid_rmax"  value="137.0 * cm"/> <comment> Central Barrel Solenoid Outer diameter </comment>
-    <constant name="cb_Solenoid_z"     value="400.0 * cm"/> <comment> Central Barrel Solenoid Size in Z direction </comment> 
-    <constant name="cb_Solenoid_shift" value="0.0 * cm"/>
 
     <constant name="Solenoid_length"         value="7000.0*mm"/>
     <constant name="Solenoid_rmin"           value="3000.0*mm"/>
     <constant name="Solenoid_thickness"      value="400*mm"/>
     <constant name="Solenoid_rmax"           value="Solenoid_rmin + Solenoid_thickness"/>
+    <constant name="Solenoid_offset"         value="1000.0*mm"/>
 
     <comment>Solenoid Barrel Parameters</comment>
     <constant name="SolenoidBarrelCryostatThickness"      value=" 1.0 * cm"/>
@@ -291,33 +300,38 @@
 
     <constant name="SolenoidYokeEndcapP_rmin"     value="SolenoidBarrel_rmin"/>
     <constant name="SolenoidYokeEndcapN_rmin"     value="SolenoidBarrel_rmin"/>
-    <constant name="SolenoidYokeEndcap_zmin"      value="SolenoidCoil_zmax"/>
-    <constant name="SolenoidYokeEndcap_zmax"      value="SolenoidYokeEndcap_zmin + SolenoidYokeEndcap_thickness"/>
+    <constant name="SolenoidYokeEndcapP_zmin"      value="SolenoidCoil_zmax + Solenoid_offset"/>
+    <constant name="SolenoidYokeEndcapP_zmax"      value="SolenoidYokeEndcapP_zmin + SolenoidYokeEndcap_thickness"/>
+    <constant name="SolenoidYokeEndcapN_zmin"      value="SolenoidCoil_zmax - Solenoid_offset"/>
+    <constant name="SolenoidYokeEndcapN_zmax"      value="SolenoidYokeEndcapN_zmin + SolenoidYokeEndcap_thickness"/>
 
     <constant name="SolenoidYokeChamferAngle"    value="0.2"/>
 
 
     <comment>
-      ---------------------------------
-      Other Central Detector parameters
       --------------------------------
+      Key Central Detector Parameters
+      --------------------------------
+
       These are needed here to compute the dependent parameters.
     </comment>
 
     <constant name="RICHLength"       value="1.1*m"/>
     <constant name="TRDLength"        value="20.0*cm"/>
     <constant name="ForwardTOFLength" value="10.0*cm"/>
-    <constant name="ForwardPIDLength" value="RICHLength + TRDLength + ForwardTOFLength"/>
     
     <constant name="BackwardCherenkovLength"   value="15.0*cm"/>
     <constant name="BackwardTOFLength"         value="10.0*cm"/>
+
+    <comment> Total length of PID detectors above</comment>
+    <constant name="ForwardPIDLength"    value="RICHLength + TRDLength + ForwardTOFLength"/>
     <constant name="BackwardPIDLength"   value="BackwardCherenkovLength + BackwardTOFLength"/>
 
     <constant name="BarrelPIDThickness"  value="25.0 * cm"/>
 
     <comment>
       ============================
-      Tracking Parameters
+      Tracking Detector Parameters
       ============================
     </comment>
 
@@ -346,7 +360,7 @@
     <constant name="SiliconTrackerInnerRadius"       value="95.0*mm"/>
     <constant name="SiliconTrackerInnerBarrelLength" value="300.0*mm"/>
     <constant name="SiliconTrackerOuterRadius"       value="Solenoid_rmax/3.0"/>
-    <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5 - ForwardTrackingGEMLength"/>
+    <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5"/>
     <constant name="SiliconTrackerOuterBarrel_zmax"  value="SiliconTrackerOuterBarrelLength/2.0"/>
 
     <comment>

compact/solenoid.xml

@@ -19,8 +19,9 @@
     <detector 
       id="Solenoid_ID"
       name="SolenoidCoilBarrel" 
-      type="DD4hep_MultiLayerTracker" 
+      type="refdet_SolenoidCoil" 
       insideTrackingVolume="false">
+      <position x="0" y="0" z="Solenoid_offset"/>
       <layer id="1" 
         inner_r="Solenoid_rmin" 
         outer_z="SolenoidBarrel_zmax"