diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8446b467a3225de3cccdcbe843dc8afd6150d6a..e411837dae730e738ce4cd5581976b3cf944d7f5 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 1ccfcd5557345e8817726fd2c2382dfe9d50c1e6..1fa7d5a3389ef980a437ab67bf572f646acd89c0 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"/>