From 0c281336aa8b13e47552be45199dd7ba90b8a608 Mon Sep 17 00:00:00 2001
From: "jihee.kim" <jihee.kim@anl.gov>
Date: Wed, 24 Mar 2021 12:39:32 -0500
Subject: [PATCH] Rearranged xml files
---
cb_Solenoid.xml | 68 ------------------------------------
compact/cb_Solenoid.xml | 46 ++++++++++++++++++++++++
compact/display.xml | 1 +
compact/refdetector_defs.xml | 16 +++++++++
reference_detector.xml | 23 ++++++------
5 files changed, 76 insertions(+), 78 deletions(-)
delete mode 100644 cb_Solenoid.xml
create mode 100644 compact/cb_Solenoid.xml
create mode 100644 compact/refdetector_defs.xml
diff --git a/cb_Solenoid.xml b/cb_Solenoid.xml
deleted file mode 100644
index 36ede763..00000000
--- a/cb_Solenoid.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<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>
-
- <!-- 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>
- </limits>
-
- <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 -->
- <detectors>
- <comment>
- Central Barrel Solenoid Magnet
- </comment>
- <detector id="cb_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>
- </detectors>
-
- <plugins>
- </plugins>
-
- <!-- 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>
diff --git a/compact/cb_Solenoid.xml b/compact/cb_Solenoid.xml
new file mode 100644
index 00000000..112775fc
--- /dev/null
+++ b/compact/cb_Solenoid.xml
@@ -0,0 +1,46 @@
+<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>
+
+ <define>
+ </define>
+
+ <limits>
+ </limits>
+
+ <regions>
+ </regions>
+
+ <display>
+ </display>
+
+ <!-- Define detector -->
+ <detectors>
+ <comment>
+ Central Barrel Solenoid Magnet
+ </comment>
+ <detector id="cb_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>
+ </detectors>
+
+ <plugins>
+ </plugins>
+
+ <!-- TODO: Define field using field map-->
+ <fields>
+ </fields>
+</lccdd>
diff --git a/compact/display.xml b/compact/display.xml
index c0fb0f78..b2ad9891 100644
--- a/compact/display.xml
+++ b/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.
diff --git a/compact/refdetector_defs.xml b/compact/refdetector_defs.xml
new file mode 100644
index 00000000..da0a1459
--- /dev/null
+++ b/compact/refdetector_defs.xml
@@ -0,0 +1,16 @@
+ <!-- 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>
diff --git a/reference_detector.xml b/reference_detector.xml
index f7e63e45..77a52a94 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -1,13 +1,14 @@
-<?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"/>
--
GitLab