From 3569d20cf9b8ee74dc97c4cb1ea2601833225089 Mon Sep 17 00:00:00 2001
From: Marshall Scott <mbscott@anl.gov>
Date: Thu, 8 Apr 2021 20:59:15 -0400
Subject: [PATCH] Just current
---
compact/ci_HCAL.xml | 7 +------
reference_detector.xml | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/compact/ci_HCAL.xml b/compact/ci_HCAL.xml
index bcfd708..a5d335e 100644
--- a/compact/ci_HCAL.xml
+++ b/compact/ci_HCAL.xml
@@ -15,16 +15,11 @@
<includes>
<gdmlFile ref="elements.xml"/>
<gdmlFile ref="materials.xml"/>
+ <gdmlFile ref="refdetector_defs.xml"/>
</includes>
<!-- Define the dimensions of the world volume -->
<define>
- <!-- Temporary, just dummy place holders at the moment -->
- <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="500.*m"/><!--Taken from DetectorConfig.hh-->
-
<constant name="ci_HCAL_id" value="1"/>
<constant name="ci_HCAL_rin" value="0 * cm"/>
<constant name="ci_HCAL_rout" value="300 * cm"/>
diff --git a/reference_detector.xml b/reference_detector.xml
index 6d46ffa..8209141 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -123,8 +123,14 @@
<include ref="compact/ffi_ZDC.xml"/>
<!--
+<<<<<<< HEAD
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
+=======
+ <include ref="compact/ci_HCAL.xml"/>
+ -->
+ <!--
+>>>>>>> 0995649 (Just current)
<include ref="compact/roman_pots.xml"/>
-->
<include ref="eic/forward_ion_beamline.xml"/>
--
GitLab