Skip to content
Snippets Groups Projects
Commit b167e98b authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'ion_beamline' into 'master'

Adding link for eic forward ion beamline

See merge request reference_detector!21
parents 0062603c b5d6d41a
No related branches found
No related tags found
No related merge requests found
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
<define> <define>
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
<!--
<include ref="eic/eic_defs.xml" /> <include ref="eic/eic_defs.xml" />
<include ref="ip6/ip6_defs.xml" />
<!--
--> -->
</define> </define>
...@@ -110,10 +111,10 @@ ...@@ -110,10 +111,10 @@
</display> </display>
<!-- <!--
<include ref="ip6/beampipe.xml"/>
<include ref="reference_detector/vertex_tracker.xml"/> <include ref="reference_detector/vertex_tracker.xml"/>
<include ref="compact/silicon_tracker.xml"/> <include ref="compact/silicon_tracker.xml"/>
--> -->
<include ref="ip6/beampipe.xml"/>
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<include ref="compact/hcal.xml"/> <include ref="compact/hcal.xml"/>
...@@ -121,8 +122,8 @@ ...@@ -121,8 +122,8 @@
<!-- <!--
<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"/>
<!--
--> -->
<detectors> <detectors>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
1 1
1 1
0.001 0.001
1 0
1 1
1 1
1 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment