Skip to content
Snippets Groups Projects
Commit 1b8a4da0 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Fixes to make ip6 behave more predictably

parent 79dd2433
No related branches found
No related tags found
1 merge request!117Fixes to make ip6 behave more predictably
Pipeline #34057 failed
Stage: config
Stage: initialize
Stage: test
Stage: docs
Stage: collect
Stage: deploy
Pipeline: athena

#34062

    Hide whitespace changes
    Inline Side-by-side
    .gitlab-ci.yml
    + 16
    − 16
    View file @ 1b8a4da0
    ...@@ -12,7 +12,7 @@ default: ...@@ -12,7 +12,7 @@ default:
    before_script: before_script:
    - source .local/bin/env.sh - source .local/bin/env.sh
    artifacts: artifacts:
    expire_in: 72 hours expire_in: 72 hours
    paths: paths:
    - .local/detector - .local/detector
    - .local/lib - .local/lib
    ...@@ -32,23 +32,23 @@ stages: ...@@ -32,23 +32,23 @@ stages:
    - config - config
    - initialize - initialize
    - build - build
    - test - test
    - docs - docs
    - collect - collect
    - finalize - finalize
    - deploy - deploy
    common:setup: common:setup:
    stage: config stage: config
    rules: rules:
    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
    before_script: 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: script:
    - | - |
    source setup/bin/env.sh && ./setup/bin/install_common.sh source setup/bin/env.sh && ./setup/bin/install_common.sh
    export BEAMLINE_CONFIG="ip6" export BEAMLINE_CONFIG="ip6"
    if [[ -z "${JUGGLER_DETECTOR}" ]]; then if [[ -z "${JUGGLER_DETECTOR}" ]]; then
    export JUGGLER_DETECTOR="athena" export JUGGLER_DETECTOR="athena"
    fi fi
    if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
    ...@@ -68,7 +68,7 @@ common:setup: ...@@ -68,7 +68,7 @@ common:setup:
    fi fi
    - | - |
    source .local/bin/env.sh 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 .. make install && cd ..
    mkdir_local_data_link sim_output mkdir_local_data_link sim_output
    ls -lrth ls -lrth
    ...@@ -101,10 +101,10 @@ include: ...@@ -101,10 +101,10 @@ include:
    dump_constants: dump_constants:
    stage: test stage: test
    needs: needs:
    - ["common:detector"] - ["common:detector"]
    script: script:
    - npdet_info dump eic_ip6.xml | tee doc/constants.out - npdet_info dump ip6.xml | tee doc/constants.out
    dump_geometry: dump_geometry:
    stage: test stage: test
    ...@@ -113,29 +113,29 @@ dump_geometry: ...@@ -113,29 +113,29 @@ dump_geometry:
    script: script:
    - echo "dumping geometry" - echo "dumping geometry"
    - mkdir -p geo - 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&" - 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: xmllint:
    stage: test stage: test
    needs: needs:
    - ["common:detector"] - ["common:detector"]
    script: script:
    - xmllint ip6/*.xml eic_ip6.xml > /dev/null - xmllint ip6/*.xml ip6.xml > /dev/null
    overlap_check: overlap_check:
    stage: test stage: test
    needs: needs:
    - ["common:detector"] - ["common:detector"]
    script: script:
    - checkOverlaps -c eic_ip6.xml - checkOverlaps -c ip6.xml
    overlap_check_geant4: overlap_check_geant4:
    stage: test stage: test
    needs: needs:
    - ["common:detector"] - ["common:detector"]
    script: 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..." - 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
    ......
    CMakeLists.txt
    + 4
    − 1
    View file @ 1b8a4da0
    ...@@ -78,7 +78,7 @@ install(DIRECTORY ip6/ ...@@ -78,7 +78,7 @@ install(DIRECTORY ip6/
    DESTINATION share/${PROJECT_NAME}/ip6 DESTINATION share/${PROJECT_NAME}/ip6
    FILES_MATCHING PATTERN "*.xml" FILES_MATCHING PATTERN "*.xml"
    ) )
    install(FILES eic_ip6.xml install(FILES ip6.xml
    DESTINATION share/${PROJECT_NAME}/ DESTINATION share/${PROJECT_NAME}/
    ) )
    ...@@ -95,3 +95,6 @@ configure_file(templates/setup.sh.in ${CMAKE_CURRENT_BINARY_DIR}/setup.sh @ONLY) ...@@ -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 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.sh
    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ip6/ip6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ip6/ip6
    ) )
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.sh
    DESTINATION ${CMAKE_INSTALL_PREFIX}
    )
    eic_ip6.xml → ip6.xml
    + 5
    − 5
    View file @ 1b8a4da0
    ...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
    Change this to 275/100/41 to change the field setup Change this to 275/100/41 to change the field setup
    </comment> </comment>
    <include ref="ip6/far_forward/fields_275.xml"/> <include ref="ip6/far_forward/fields_275.xml"/>
    <constant name="tracker_region_zmax" value="10*m"/> <constant name="tracker_region_zmax" value="10*m"/>
    <constant name="tracker_region_rmax" value="1*m"/> <constant name="tracker_region_rmax" value="1*m"/>
    <documentation> <documentation>
    #### (150-169) Far Forward Detectors #### (150-169) Far Forward Detectors
    - Forward Roman Pot ID: 150 - Forward Roman Pot ID: 150
    ...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
    <documentation> <documentation>
    #### (170-189) Far Forward Beamline Magnets #### (170-189) Far Forward Beamline Magnets
    </documentation> </documentation>
    <constant name="B0PF_ID" value="170"/> <constant name="B0PF_ID" value="170"/>
    <constant name="B0APF_ID" value="171"/> <constant name="B0APF_ID" value="171"/>
    <constant name="Q1APF_ID" value="172"/> <constant name="Q1APF_ID" value="172"/>
    ...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
    <constant name="TaggerTracker_2_ID" value="198"/> <constant name="TaggerTracker_2_ID" value="198"/>
    <constant name="TaggerCalorimeter_2_ID" value="199"/> <constant name="TaggerCalorimeter_2_ID" value="199"/>
    <documentation> <documentation>
    #### (200-219) Far Backward Beamline Magnets #### (200-219) Far Backward Beamline Magnets
    </documentation> </documentation>
    <constant name="Pipe_to_Q1eR_ID" value="200"/> <constant name="Pipe_to_Q1eR_ID" value="200"/>
    ......
    views/generate_prim_files.yml
    + 5
    − 7
    View file @ 1b8a4da0
    ...@@ -2,7 +2,7 @@ view_prim:detector_only: ...@@ -2,7 +2,7 @@ view_prim:detector_only:
    extends: .views extends: .views
    stage: test stage: test
    script: 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} - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
    view_prim:ev001: view_prim:ev001:
    ...@@ -11,7 +11,7 @@ view_prim:ev001: ...@@ -11,7 +11,7 @@ view_prim:ev001:
    rules: rules:
    - if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
    script: 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: view_prim:ev002:
    extends: .views extends: .views
    ...@@ -19,7 +19,7 @@ view_prim:ev002: ...@@ -19,7 +19,7 @@ view_prim:ev002:
    rules: rules:
    - if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
    script: 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: view_prim:ev003:
    extends: .views extends: .views
    ...@@ -27,7 +27,7 @@ view_prim:ev003: ...@@ -27,7 +27,7 @@ view_prim:ev003:
    rules: rules:
    - if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
    script: 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: view_prim:ev004:
    extends: .views extends: .views
    ...@@ -35,6 +35,4 @@ view_prim:ev004: ...@@ -35,6 +35,4 @@ view_prim:ev004:
    rules: rules:
    - if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
    script: 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
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment