From 63168a375f0150799a4cd7df47e1f8de0525681f Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 5 May 2021 13:47:23 -0500
Subject: [PATCH] Fixed last remaining overlap and check
modified: .gitlab-ci.yml
modified: compact/solenoid.xml
---
.gitlab-ci.yml | 2 +-
compact/solenoid.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8446b46..e411837d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ overlap_check:
script:
- checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
- - if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "1" ]] ; then echo "Overlaps exist!" && false ; fi
+ - if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
detector:config_testing:
stage: test
diff --git a/compact/solenoid.xml b/compact/solenoid.xml
index 1ccfcd55..1fa7d5a3 100644
--- a/compact/solenoid.xml
+++ b/compact/solenoid.xml
@@ -102,6 +102,8 @@
-->
</detector>
+
+ <!--
<detector
id="SolenoidYoke_ID"
name="SolenoidYokeEndcaps"
@@ -118,7 +120,6 @@
<slice material="Steel235" thickness="SolenoidYokeEndcap_thickness/2.0" vis="SolenoidYokeVis" />
</layer>
</detector>
- <!--
<detector name="SolenoidYoke" type="SiEIC_Yoke" vis="SolenoidYokeVis">
<material name="Steel235"/>
<dimensions inner_radius="SolenoidYokeInnerRadius" thickness="SolenoidYokeThickness" rmin="CaloInnerRadius + 10 * mm" angle="SolenoidYokeChamferAngle" inner_z="SolenoidYokeInnerZ"/>
--
GitLab