Merge branch 'solenoid' into 'master'

Solenoid update

See merge request !18

compact/cb_Solenoid.xml

-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" 
-       xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
-
-  <!-- Some information about detector  -->
-  <info name="Central Barrel Solenoid" title="Central Barrel Solenoid"
-        author="Jihee Kim"
-        url="https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git"
-        status="development"
-        version="v1 2021-03-15">
-    <comment>Central Barrel Solenoid</comment>        
-  </info>
-
-  <includes>
-  </includes>
-  
+<lccdd>
+
+  <comment>Central Barrel Solenoid</comment>        
+
   <define>
   </define>
 
@@ -31,7 +19,7 @@
     <comment>
       Central Barrel Solenoid Magnet
     </comment>
-    <detector id="cb_Solenoid_ID" name="cb_Solenoid" type="cb_Solenoid" insideTrackingVolume="false" vis="cb_SolenoidVis">
+    <detector id="Solenoid_ID" name="cb_Solenoid" type="cb_Solenoid" insideTrackingVolume="false" vis="cb_SolenoidVis">
 	    <material name="Vacuum"/>  <!-- G4_Galactic -->	    
       <dimensions rmin="cb_Solenoid_rmin" rmax="cb_Solenoid_rmax" z="cb_Solenoid_z" delta="cb_Solenoid_shift"/>
     </detector>

compact/definitions.xml

@@ -235,6 +235,15 @@
       Solenoid Magnet Parameters
       --------------------------
     </comment>
+
+    <comment>
+      These cb_ parameters don't make sense
+    </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"/> 
+    <constant name="cb_Solenoid_shift" value="0.0 * cm"/><comment> Central Barrel Solenoid Size in Z direction </comment>
+
     <constant name="Solenoid_thickness"      value="400*mm"/>
     <constant name="Solenoid_rmin"           value="2000.0*mm"/>
     <constant name="Solenoid_rmax"           value="Solenoid_rmin + Solenoid_thickness"/>

compact/refdetector_defs.xml

@@ -8,9 +8,4 @@
     <constant name="tracker_region_zmax" value="6 * m"/>
     <constant name="tracker_region_rmax" value="6 * m"/>
 
-    <constant name="cb_Solenoid_ID"    value="1"/>
-    <constant name="cb_Solenoid_rmin"  value="0.0 * cm"/>   <!-- Central Barrel Solenoid Inner diameter -->
-    <constant name="cb_Solenoid_rmax"  value="137.0 * cm"/> <!-- Central Barrel Solenoid Outer diameter -->
-    <constant name="cb_Solenoid_z"     value="400.0 * cm"/> <!-- Central Barrel Solenoid Size in Z direction -->
-    <constant name="cb_Solenoid_shift" value="0.0 * cm"/>
   </define>

compact/solenoid.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd>
+  <define>
+    <comment>
+      --------------------------
+      Solenoid Magnet Parameters
+      --------------------------
+    </comment>
+  </define>
+
+  <detectors>
+    <comment>
+      ---------------
+      Solenoid Magnet
+      ---------------
+      The solenoid superconducting magnet and surrounding cryostat and
+      yoke endcaps.
+    </comment>
+    <detector 
+      id="Solenoid_ID"
+      name="SolenoidCoilBarrel" 
+      type="DD4hep_MultiLayerTracker" 
+      insideTrackingVolume="false">
+      <layer id="1" 
+        inner_r="Solenoid_rmin" 
+        outer_z="SolenoidBarrel_zmax" 
+        vis="SolenoidCryostatVis">
+        <slice material="Steel235" thickness="SolenoidBarrelCryostatThickness"/>
+        <slice material="Vacuum" thickness="SolenoidBarrelGapThickness"/>
+      </layer>
+      <layer id="2" 
+        inner_r="SolenoidCoilConductor_rmin" 
+        outer_z="SolenoidCoil_zmax" 
+        vis="SolenoidCoilVis">
+        <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness"/>
+        <slice material="Aluminum" thickness="SolenoidBarrelQuenchbackThickness"/>
+      </layer>
+      <layer id="3" 
+        inner_r="SolenoidCoilConductor_rmax" 
+        outer_z="SolenoidBarrel_zmax" 
+        vis="SolenoidCryostatVis">
+        <slice material="Vacuum" thickness="SolenoidBarrelOuterGapThickness"/>
+        <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness"/>
+      </layer>
+    </detector>
+
+    <detector 
+      id="SolenoidSupport_ID"
+      name="SolenoidCoilEnds"
+      type="DD4hep_DiskTracker"
+      insideTrackingVolume="false"
+      reflect="true"
+      vis="SolenoidCryostatVis">
+      <layer id="1" 
+        inner_z="SolenoidCoil_zmax" 
+        inner_r="SolenoidCoilConductor_rmin" 
+        outer_r="SolenoidCoilConductor_rmax">
+        <slice material="Vacuum" thickness="SolenoidEndPlateGapThickness/2.0"/>
+      </layer>
+      <!--
+      <layer id="2" 
+        inner_z="SolenoidCoil_zmax + SolenoidEndPlateGapThickness" 
+        inner_r="Solenoid_rmin+SolenoidBarrelCryostatThickness" 
+        outer_r="SolenoidBarrel_rmax-SolenoidBarrelOuterCryostatThickness">
+        <slice material="Steel235" thickness="SolenoidEndPlateCryostatThickness"/>
+      </layer>
+      -->
+    </detector>
+
+    <detector 
+      id="SolenoidYoke_ID"
+      name="SolenoidYokeEndcaps"
+      type="DD4hep_DiskTracker"
+      insideTrackingVolume="false"
+      reflect="true"
+      vis="SolenoidYokeVis">
+      <layer id="1" 
+        vis="PurpleVis"
+        inner_z="SolenoidBarrel_zmax + SolenoidEndPlateGapThickness" 
+        inner_r="SolenoidYokeEndcapP_rmin" 
+        outer_r="SolenoidBarrel_rmax">
+        <slice material="Steel235" thickness="SolenoidYokeEndcapThickness/2.0" vis="SolenoidYokeVis" />
+      </layer>
+    </detector>
+    <!--
+    <detector name="SolenoidYoke" type="SiEIC_Yoke" vis="SolenoidYokeVis">
+      <material name="Steel235"/>
+      <dimensions inner_radius="SolenoidYokeInnerRadius" thickness="SolenoidYokeThickness" rmin="CaloInnerRadius + 10 * mm" angle="SolenoidYokeChamferAngle" inner_z="SolenoidYokeInnerZ"/>
+    </detector>
+    -->
+  </detectors>
+
+  <fields>
+    <field type="solenoid" name="GlobalSolenoid" inner_field="3.0 * tesla" outer_field="0.5*tesla" 
+           zmin="-SolenoidCoil_zmax" zmax="SolenoidCoil_zmax" 
+           inner_radius="SolenoidalFieldRadius" outer_radius="SolenoidalFieldRadius+20*cm"/>
+  </fields>
+
+</lccdd>

reference_detector.xml

@@ -114,9 +114,9 @@
   <include ref="compact/beampipe.xml"/>
   <include ref="compact/silicon_tracker.xml"/>
   -->
-  <include ref="compact/cb_Solenoid.xml"/>
-  <include ref="compact/ecal.xml"/>
+  <include ref="compact/solenoid.xml"/>
   <!--
+  <include ref="compact/ecal.xml"/>
   <include ref="compact/solenoid.xml"/>
   <include ref="compact/hcal.xml"/>
   <include ref="compact/reference_detector_rich.xml"/>