Skip to content
Snippets Groups Projects
Commit e3954818 authored by Marshall Scott's avatar Marshall Scott
Browse files

test new rmax limits

parent 3defed06
Branches
No related tags found
No related merge requests found
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
...@@ -588,14 +588,14 @@ ...@@ -588,14 +588,14 @@
</comment> </comment>
<constant name="ci_HCAL_id" value="200"/> <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_rout" value="300 * cm"/>
<constant name="ci_HCAL_sizez" value="160 * cm"/> <constant name="ci_HCAL_sizez" value="160 * cm"/>
<constant name="ci_HCAL_shiftz" value="5 * cm"/> <constant name="ci_HCAL_shiftz" value="5 * cm"/>
<constant name="ci_HCAL_posz" value="0 * cm"/> <constant name="ci_HCAL_posz" value="0 * cm"/>
<constant name="ci_HCAL_nlayers" value="20"/> <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_rout" value="ci_HCAL_rout - 1 * cm"/>
<constant name="ci_HCAL_lay_thickness" value="2* cm"/> <constant name="ci_HCAL_lay_thickness" value="2* cm"/>
<constant name="ci_HCAL_lay_gapz" value="2* cm"/> <constant name="ci_HCAL_lay_gapz" value="2* cm"/>
......
...@@ -123,45 +123,25 @@ ...@@ -123,45 +123,25 @@
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<include ref="compact/cb_CTD_Si.xml"/> <include ref="compact/cb_CTD_Si.xml"/>
<include ref="compact/ce_mrich.xml"/> <include ref="compact/ce_mrich.xml"/>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<include ref="compact/ce_GEM.xml"/> <include ref="compact/ce_GEM.xml"/>
<include ref="compact/ffi_ZDC.xml"/> <include ref="compact/ffi_ZDC.xml"/>
-->
<!-- <!--
<<<<<<< HEAD
<include ref="compact/forward_rich.xml"/> <include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.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_HCAL.xml"/>
<!-- <!--
<include ref="compact/ci_GEM.xml"/> <include ref="compact/ci_GEM.xml"/>
--> -->
<!-- <!--
>>>>>>> 0995649 (Just current)
<include ref="compact/roman_pots.xml"/> <include ref="compact/roman_pots.xml"/>
--> -->
<!-- <!--
<include ref="eic/forward_ion_beamline.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>
</detectors> </detectors>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment