From ddceae9224b83e36d60d2b60db3e03a1f1bcfd83 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 26 Aug 2021 21:10:23 +0000
Subject: [PATCH] Disable BECAL fibers for fast overlap check
---
.gitlab-ci.yml | 6 +++++-
compact/display.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fedc35d..9896f2f5 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 18927484..30d508d4 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"/>
--
GitLab