Skip to content
Snippets Groups Projects

Added back the full overlap check, triggered by CI variable.

Closed Sylvester Joosten requested to merge optional_full_overlap_check into master
1 file
+ 25
8
Compare changes
  • Side-by-side
  • Inline
+ 25
8
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
 
variables:
 
## set to 1 to run expensive tests
 
EXPENSIVE_TESTS: 0
 
workflow:
workflow:
rules:
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
@@ -9,6 +13,11 @@ workflow:
@@ -9,6 +13,11 @@ workflow:
- if: '$CI_COMMIT_BRANCH == "acadia"'
- if: '$CI_COMMIT_BRANCH == "acadia"'
- if: '$CI_COMMIT_TAG'
- if: '$CI_COMMIT_TAG'
 
.expensive:
 
rules:
 
- if: '$EXPENSIVE_TESTS == "0"'
 
when: never
 
default:
default:
before_script:
before_script:
- source .local/bin/env.sh
- source .local/bin/env.sh
@@ -185,29 +194,37 @@ overlap_check_tgeo:
@@ -185,29 +194,37 @@ overlap_check_tgeo:
- echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..."
- 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
- if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
overlap_check_geant4:full_fast:
overlap_check_geant4:full:
stage: test
stage: test
 
extends: .expensive
needs:
needs:
- ["common:detector"]
- ["common:detector"]
script:
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
- 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..."
- 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
- 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:full_fast:
overlap_check_geant4:inner_detector:
stage: test
stage: test
needs:
needs:
- ["common:detector"]
- ["common:detector"]
script:
script:
- cp ${DETECTOR_PATH}/compact/subsystem_views/inner_detector.xml ${DETECTOR_PATH}/inner_detector.xml
## disable fibers in ECAL for normal overlap check
- python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/inner_detector.xml | tee doc/overlap_check_geant4.out
- 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..."
- 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
- if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
 
#overlap_check_geant4:inner_detector:
 
# stage: test
 
# needs:
 
# - ["common:detector"]
 
# script:
 
# - cp ${DETECTOR_PATH}/compact/subsystem_views/inner_detector.xml ${DETECTOR_PATH}/inner_detector.xml
 
# - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/inner_detector.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
 
convert_to_gdml:
convert_to_gdml:
stage: test
stage: test
needs:
needs:
Loading