Commit ea21e2b3 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Make the test fail if overlaps are detected.

 - Require no overlaps in ci.
parent 02d8368d
Pipeline #6821 passed with stages
in 2 minutes and 55 seconds
......@@ -148,9 +148,10 @@ overlap_check:
- ["compile"]
script:
#- $(exit $(checkOverlaps -c topside.xml | tee doc/overlap_check.out | wc -l ))
- checkOverlaps -c topside.xml | tee doc/overlap_check.out | wc -l
- cat doc/overlap_check.out
allow_failure: true
- checkOverlaps -c topside.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
# allow_failure: true
topside:config_testing:
......
......@@ -320,7 +320,7 @@
------------
</comment>
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + 3.0 * cm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 * mm "/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 5.0 *cm "/>
<constant name="AvailTotalBarrelCalorimetryThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
<constant name="CalBarrelDivider" value="0.5"/> <!-- Ecal and Hcal have the same thickness -->
<constant name="EcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * CalBarrelDivider"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment