From 3defed066c225521a67c548f9629e013471ae88b Mon Sep 17 00:00:00 2001 From: Marshall Scott <mbscott@anl.gov> Date: Thu, 8 Apr 2021 21:06:20 -0400 Subject: [PATCH] stuff2 --- reference_detector.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/reference_detector.xml b/reference_detector.xml index d6ac4cc..92043eb 100644 --- a/reference_detector.xml +++ b/reference_detector.xml @@ -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) -- GitLab