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

stuff2

parent c9a3a524
No related branches found
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.
...@@ -114,13 +114,17 @@ ...@@ -114,13 +114,17 @@
<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="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/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
<<<<<<< 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"/>
...@@ -135,8 +139,13 @@ ...@@ -135,8 +139,13 @@
======= =======
>>>>>>> 3826a84 (altered gem max radius so not to overlap with 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) >>>>>>> 0995649 (Just current)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment