diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fedc35d305cb9c2a690419ca275163d38f73609..9896f2f564d6a31035e4b61c05cb8de6aa3be421 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,15 +185,19 @@ overlap_check_tgeo: - echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..." - if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi -overlap_check_geant4:full: +overlap_check_geant4:full_fast: stage: test needs: - ["common:detector"] script: + ## disable fibers in ECAL for normal overlap check + - sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_geant4.out - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..." - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi +## TODO: add real full overlap check as child pipeline to run on branches only + overlap_check_geant4:inner_detector: stage: test needs: diff --git a/compact/display.xml b/compact/display.xml index 189274846fbead59395ad2f80e9512c59b13234e..30d508d4d65b50a16156e924fa66b4ad7219ecdc 100644 --- a/compact/display.xml +++ b/compact/display.xml @@ -66,7 +66,7 @@ <vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="false"/> <vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="true" visible="false"/> <vis name="DIRCModuleVis" ref="AnlTeal" showDaughters="true" visible="false"/> - <vis name="DIRCSupportVis" ref="AnlGray" showDaughters="true" visible="true"/> + <vis name="DIRCSupportVis" ref="AnlTeal" showDaughters="true" visible="true"/> <vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/> <vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>