From e3954818fc9a8f49a4410e59a580e0585b02fbf5 Mon Sep 17 00:00:00 2001
From: Marshall Scott <mbscott@anl.gov>
Date: Thu, 8 Apr 2021 21:24:37 -0400
Subject: [PATCH] test new rmax limits
---
compact/definitions.xml | 4 ++--
reference_detector.xml | 30 +++++-------------------------
2 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index d7fda9b..a985691 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -588,14 +588,14 @@
</comment>
<constant name="ci_HCAL_id" value="200"/>
- <constant name="ci_HCAL_rin" value="225 * cm"/><!-- Original = 0cm -->
+ <constant name="ci_HCAL_rin" value="SolenoidBarrel_rmax + 1 * cm"/><!-- Original = 0cm -->
<constant name="ci_HCAL_rout" value="300 * cm"/>
<constant name="ci_HCAL_sizez" value="160 * cm"/>
<constant name="ci_HCAL_shiftz" value="5 * cm"/>
<constant name="ci_HCAL_posz" value="0 * cm"/>
<constant name="ci_HCAL_nlayers" value="20"/>
- <constant name="ci_HCAL_lay_rin" value="225 * cm"/> <!-- Original = 80cm -->
+ <constant name="ci_HCAL_lay_rin" value="ci_HCAL_rin"/> <!-- Original = 80cm -->
<constant name="ci_HCAL_lay_rout" value="ci_HCAL_rout - 1 * cm"/>
<constant name="ci_HCAL_lay_thickness" value="2* cm"/>
<constant name="ci_HCAL_lay_gapz" value="2* cm"/>
diff --git a/reference_detector.xml b/reference_detector.xml
index 92043eb..9f0b2a0 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -123,45 +123,25 @@
<include ref="compact/ecal.xml"/>
<include ref="compact/cb_CTD_Si.xml"/>
<include ref="compact/ce_mrich.xml"/>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
<include ref="compact/ce_GEM.xml"/>
<include ref="compact/ffi_ZDC.xml"/>
-
+ -->
<!--
-<<<<<<< HEAD
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
-=======
-=======
->>>>>>> 646cf72 (Finalized xml and cpp files for GEM and HCAL)
-=======
-
->>>>>>> 3826a84 (altered gem max radius so not to overlap with hcal)
-=======
--->
->>>>>>> a9e5fbb (stuff)
+ -->
<include ref="compact/ci_HCAL.xml"/>
<!--
<include ref="compact/ci_GEM.xml"/>
--->
+ -->
<!--
->>>>>>> 0995649 (Just current)
<include ref="compact/roman_pots.xml"/>
-->
<!--
<include ref="eic/forward_ion_beamline.xml"/>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-=======
--->
->>>>>>> 3826a84 (altered gem max radius so not to overlap with hcal)
-
->>>>>>> 646cf72 (Finalized xml and cpp files for GEM and HCAL)
+-->
+
<detectors>
</detectors>
--
GitLab