Skip to content
Snippets Groups Projects

Resolve "Implement ci_GEM"

Merged Marshall Scott requested to merge 20-implement-ci_gem into master
1 file
+ 10
1
Compare changes
  • Side-by-side
  • Inline
+ 10
1
@@ -114,13 +114,17 @@
<include ref="reference_detector/vertex_tracker.xml"/>
<include ref="compact/silicon_tracker.xml"/>
-->
<!--
<include ref="ip6/beampipe.xml"/>
-->
<include ref="compact/solenoid.xml"/>
<!--
<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"/>
@@ -135,8 +139,13 @@
=======
>>>>>>> 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)
Loading