Merge branch 'ref_det' into 'master'

reference_detector.xml

See merge request reference_detector!15

cb_Solenoid.xml → compact/cb_Solenoid.xml

@@ -11,27 +11,10 @@
     <comment>Central Barrel Solenoid</comment>        
   </info>
 
-  <!-- Use DD4hep elements and materials definitions -->
   <includes>
-    <gdmlFile ref="elements.xml"/>
-    <gdmlFile ref="materials.xml"/>
   </includes>
   
-  <!-- Define the dimensions of the world volume -->
   <define>
-    <constant name="world_side" value="50*m"/>
-    <constant name="world_x"    value="world_side"/>
-    <constant name="world_y"    value="world_side"/>
-    <constant name="world_z"    value="world_side"/>
-
-    <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>
 
   <limits>
@@ -40,10 +23,7 @@
   <regions>
   </regions>
 
-  <!-- Common Generic visualization attributes -->
-  <comment>Common Generic visualization attributes</comment>
   <display>
-    <vis name="cb_SolenoidVis" alpha="0.4"  r= "0.1"  g="0.0"  b="0.1"  showDaughters="true" visible="true"/>
   </display>
 
   <!-- Define detector -->
@@ -62,7 +42,5 @@
 
   <!-- TODO: Define field using field map-->
   <fields>
-    <field type="solenoid" name="GlobalSolenoid" inner_field="1.5 * tesla" outer_field="0.5*tesla" 
-           zmin="100.0 * cm" zmax="100.0 * cm" inner_radius="100.0 * cm" outer_radius="100.0 * cm"/>
   </fields>
 </lccdd>

compact/display.xml

@@ -48,6 +48,7 @@
     <vis name="RICHVis" alpha="0.5" r="1" g="0" b="1" showDaughters="false"/>
     <vis name="BeamPipeVis"    alpha="1"  r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/>
 
+    <vis name="cb_SolenoidVis" alpha="0.4"  r= "0.1"  g="0.0"  b="0.1"  showDaughters="true" visible="true"/>
 
     <comment>
       Deprecated colors.

compact/refdetector_defs.xml

+  <!-- Define parameter -->
+  <define>
+    <constant name="world_side" value="50*m"/>
+    <constant name="world_x"    value="world_side"/>
+    <constant name="world_y"    value="world_side"/>
+    <constant name="world_z"    value="world_side"/>
+
+    <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>

reference_detector.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<lccdd>
-  <info 
-    name="reference_detector" 
-    title="reference_detector" 
-    author="Whitney R. Armstrong" 
-    url="" 
-    status="development" 
-    version="$Id: 1$">
-    <comment> </comment>
+<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="Reference Detector" title="Reference Detector"
+        author="Jihee Kim, Whitney Armstrong"
+	url="https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git"
+	status="development"
+	version="v1 2021-03-16">
+    <comment>Test Detector</comment>        
   </info>
 
   <define>
@@ -88,6 +89,7 @@
       <property name="EFFICIENCY"              coldim="2" values="2.034*eV  0.8   4.136*eV  1.0"/>
       <property name="RINDEX"                  coldim="2" values="1.034*eV  1.5   4.136*eV  1.5"/>
     </opticalsurface>
+  <!-- Define the dimensions of the world volume -->
 
   </surfaces>
   <limits>
@@ -112,6 +114,7 @@
   <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"/>