diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d21a65b3d4dac49c5c9726980c64686e98edef5f..110b97ca6f848828ebe8ae182e447ae8eb745bf3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ default: before_script: - source .local/bin/env.sh artifacts: - expire_in: 72 hours + expire_in: 72 hours paths: - .local/detector - .local/lib @@ -32,23 +32,23 @@ stages: - config - initialize - build - - test + - test - docs - collect - - finalize + - finalize - deploy common:setup: stage: config rules: - - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' + - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' before_script: - - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup + - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup script: - | source setup/bin/env.sh && ./setup/bin/install_common.sh export BEAMLINE_CONFIG="ip6" - if [[ -z "${JUGGLER_DETECTOR}" ]]; then + if [[ -z "${JUGGLER_DETECTOR}" ]]; then export JUGGLER_DETECTOR="athena" fi if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then @@ -68,7 +68,7 @@ common:setup: fi - | source .local/bin/env.sh - mkdir -p build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} && make -j20 || exit -1 + mkdir -p build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} && make -j20 || exit -1 make install && cd .. mkdir_local_data_link sim_output ls -lrth @@ -101,10 +101,10 @@ include: dump_constants: stage: test - needs: + needs: - ["common:detector"] script: - - npdet_info dump eic_ip6.xml | tee doc/constants.out + - npdet_info dump ip6.xml | tee doc/constants.out dump_geometry: stage: test @@ -113,29 +113,29 @@ dump_geometry: script: - echo "dumping geometry" - mkdir -p geo - - dd_web_display --output geo/detector_geo_full.root eic_ip6.xml + - dd_web_display --output geo/detector_geo_full.root ip6.xml - echo "Geometry viewer at https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/ip6/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&" xmllint: stage: test - needs: + needs: - ["common:detector"] script: - - xmllint ip6/*.xml eic_ip6.xml > /dev/null + - xmllint ip6/*.xml ip6.xml > /dev/null overlap_check: stage: test - needs: + needs: - ["common:detector"] script: - - checkOverlaps -c eic_ip6.xml + - checkOverlaps -c ip6.xml overlap_check_geant4: stage: test - needs: + needs: - ["common:detector"] script: - - python scripts/checkOverlaps.py -c eic_ip6.xml | tee doc/overlap_check_geant4.out + - python scripts/checkOverlaps.py -c ip6.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index b34e36d7c5654f98480ba3fedfea528c65364d11..2b4f5be409ec3a43b6abd4788f083bbbb4f7fc6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ install(DIRECTORY ip6/ DESTINATION share/${PROJECT_NAME}/ip6 FILES_MATCHING PATTERN "*.xml" ) -install(FILES eic_ip6.xml +install(FILES ip6.xml DESTINATION share/${PROJECT_NAME}/ ) @@ -95,3 +95,6 @@ configure_file(templates/setup.sh.in ${CMAKE_CURRENT_BINARY_DIR}/setup.sh @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ip6/ip6 ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.sh + DESTINATION ${CMAKE_INSTALL_PREFIX} +) diff --git a/eic_ip6.xml b/ip6.xml similarity index 98% rename from eic_ip6.xml rename to ip6.xml index 33777e832573e14ea392afabbbc1e322eb20ca7a..4339a0fe8384da306c416bb59dab63c0eca93353 100644 --- a/eic_ip6.xml +++ b/ip6.xml @@ -15,11 +15,11 @@ Change this to 275/100/41 to change the field setup </comment> <include ref="ip6/far_forward/fields_275.xml"/> - + <constant name="tracker_region_zmax" value="10*m"/> <constant name="tracker_region_rmax" value="1*m"/> - - <documentation> + + <documentation> #### (150-169) Far Forward Detectors - Forward Roman Pot ID: 150 @@ -46,7 +46,7 @@ <documentation> #### (170-189) Far Forward Beamline Magnets - </documentation> + </documentation> <constant name="B0PF_ID" value="170"/> <constant name="B0APF_ID" value="171"/> <constant name="Q1APF_ID" value="172"/> @@ -75,7 +75,7 @@ <constant name="TaggerTracker_2_ID" value="198"/> <constant name="TaggerCalorimeter_2_ID" value="199"/> - <documentation> + <documentation> #### (200-219) Far Backward Beamline Magnets </documentation> <constant name="Pipe_to_Q1eR_ID" value="200"/> diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml index b5d1019e8401f1f33165c59f06f2bb1d2bfed4c9..114a77c8703431cb4cf3aa035f91a9a05c3c2fd9 100644 --- a/views/generate_prim_files.yml +++ b/views/generate_prim_files.yml @@ -2,7 +2,7 @@ view_prim:detector_only: extends: .views stage: test script: - - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view -c eic_ip6.xml + - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view -c ip6.xml - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} view_prim:ev001: @@ -11,7 +11,7 @@ view_prim:ev001: rules: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev001 -s 1 -c eic_ip6.xml + - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev001 -s 1 -c ip6.xml view_prim:ev002: extends: .views @@ -19,7 +19,7 @@ view_prim:ev002: rules: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev002 -s 2 -c eic_ip6.xml + - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev002 -s 2 -c ip6.xml view_prim:ev003: extends: .views @@ -27,7 +27,7 @@ view_prim:ev003: rules: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev003 -s 3 -c eic_ip6.xml + - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev003 -s 3 -c ip6.xml view_prim:ev004: extends: .views @@ -35,6 +35,4 @@ view_prim:ev004: rules: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4 -c eic_ip6.xml - - + - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4 -c ip6.xml