Skip to content
Snippets Groups Projects
Commit 63168a37 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fixed last remaining overlap and check

	modified:   .gitlab-ci.yml
	modified:   compact/solenoid.xml
parent 9c121719
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,7 @@ overlap_check: ...@@ -117,7 +117,7 @@ overlap_check:
script: script:
- checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out - checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..." - 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: detector:config_testing:
stage: test stage: test
......
...@@ -102,6 +102,8 @@ ...@@ -102,6 +102,8 @@
--> -->
</detector> </detector>
<!--
<detector <detector
id="SolenoidYoke_ID" id="SolenoidYoke_ID"
name="SolenoidYokeEndcaps" name="SolenoidYokeEndcaps"
...@@ -118,7 +120,6 @@ ...@@ -118,7 +120,6 @@
<slice material="Steel235" thickness="SolenoidYokeEndcap_thickness/2.0" vis="SolenoidYokeVis" /> <slice material="Steel235" thickness="SolenoidYokeEndcap_thickness/2.0" vis="SolenoidYokeVis" />
</layer> </layer>
</detector> </detector>
<!--
<detector name="SolenoidYoke" type="SiEIC_Yoke" vis="SolenoidYokeVis"> <detector name="SolenoidYoke" type="SiEIC_Yoke" vis="SolenoidYokeVis">
<material name="Steel235"/> <material name="Steel235"/>
<dimensions inner_radius="SolenoidYokeInnerRadius" thickness="SolenoidYokeThickness" rmin="CaloInnerRadius + 10 * mm" angle="SolenoidYokeChamferAngle" inner_z="SolenoidYokeInnerZ"/> <dimensions inner_radius="SolenoidYokeInnerRadius" thickness="SolenoidYokeThickness" rmin="CaloInnerRadius + 10 * mm" angle="SolenoidYokeChamferAngle" inner_z="SolenoidYokeInnerZ"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment