Skip to content
Snippets Groups Projects
Commit 06c71a6e authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Cleanup

parent d8c7390b
No related branches found
No related tags found
1 merge request!2Cleanup
...@@ -13,9 +13,8 @@ default: ...@@ -13,9 +13,8 @@ default:
# - datasets/.git/ # - datasets/.git/
before_script: before_script:
- git clone https://eicweb.phy.anl.gov/EIC/NPDet.git - git clone https://eicweb.phy.anl.gov/EIC/NPDet.git
- git clone https://eicweb.phy.anl.gov/EIC/detectors/topside.git - git clone https://eicweb.phy.anl.gov/EIC/detectors/topside.git && mkdir topside/build && cd topside/build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 install && cd ../..
# - cd NPDet/build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j10 && make install # - cd NPDet/build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j10 && make install
# - cd ../..
stages: stages:
- data_init - data_init
...@@ -28,7 +27,7 @@ stages: ...@@ -28,7 +27,7 @@ stages:
get_data: get_data:
stage: data_init stage: data_init
tags: tags:
- sodium - silicon
script: script:
- git clone https://eicweb.phy.anl.gov/EIC/datasets.git datasets - git clone https://eicweb.phy.anl.gov/EIC/datasets.git datasets
- ln -s datasets/data - ln -s datasets/data
...@@ -38,7 +37,7 @@ get_data: ...@@ -38,7 +37,7 @@ get_data:
#generate_config: #generate_config:
# stage: ci_gen # stage: ci_gen
# tags: # tags:
# - sodium # - silicon
# script: # script:
# - ./bin/gen_ci_config -p track_test_ -i trackers > results/trackers_config.yml # - ./bin/gen_ci_config -p track_test_ -i trackers > results/trackers_config.yml
# - ./bin/gen_ci_config -p cal_test_ -i calorimeters > results/calorimeters_config.yml # - ./bin/gen_ci_config -p cal_test_ -i calorimeters > results/calorimeters_config.yml
...@@ -47,7 +46,7 @@ get_data: ...@@ -47,7 +46,7 @@ get_data:
cal_sim_1_dummy_test2: cal_sim_1_dummy_test2:
stage: simulate stage: simulate
tags: tags:
- sodium - silicon
needs: needs:
- ["get_data"] - ["get_data"]
script: script:
...@@ -58,23 +57,15 @@ cal_test_1_dummy_test2: ...@@ -58,23 +57,15 @@ cal_test_1_dummy_test2:
needs: needs:
- ["cal_sim_1_dummy_test2"] - ["cal_sim_1_dummy_test2"]
tags: tags:
- sodium - silicon
script: script:
- bash calorimeters/dummy_test2.sh - bash calorimeters/dummy_test2.sh
allow_failure: true allow_failure: true
#cal_test_2_dummy_test:
# stage: benchmarks
# tags:
# - sodium
# script:
# - bash calorimeters/dummy_test.sh
# allow_failure: true
cal_test_3_zdc_neutrons_reader: cal_test_3_zdc_neutrons_reader:
stage: benchmarks stage: benchmarks
tags: tags:
- sodium - silicon
needs: needs:
- ["zdc_simulation"] - ["zdc_simulation"]
script: script:
...@@ -84,7 +75,7 @@ cal_test_3_zdc_neutrons_reader: ...@@ -84,7 +75,7 @@ cal_test_3_zdc_neutrons_reader:
pid_test_1_dummy_test: pid_test_1_dummy_test:
stage: benchmarks stage: benchmarks
tags: tags:
- sodium - silicon
needs: needs:
- ["cal_sim_1_dummy_test2"] - ["cal_sim_1_dummy_test2"]
script: script:
...@@ -96,7 +87,7 @@ track_test_1_dummy_test: ...@@ -96,7 +87,7 @@ track_test_1_dummy_test:
needs: needs:
- ["cal_sim_1_dummy_test2"] - ["cal_sim_1_dummy_test2"]
tags: tags:
- sodium - silicon
script: script:
- bash trackers/dummy_test.sh - bash trackers/dummy_test.sh
allow_failure: true allow_failure: true
...@@ -106,7 +97,7 @@ roman_pot_simu: ...@@ -106,7 +97,7 @@ roman_pot_simu:
needs: needs:
- ["get_data"] - ["get_data"]
tags: tags:
- sodium - silicon
script: script:
- cp NPDet/src/GenericDetectors/trackers/compact/elements.xml ./. - cp NPDet/src/GenericDetectors/trackers/compact/elements.xml ./.
- cp NPDet/src/GenericDetectors/trackers/compact/materials.xml ./. - cp NPDet/src/GenericDetectors/trackers/compact/materials.xml ./.
...@@ -117,7 +108,7 @@ roman_pot_nhits: ...@@ -117,7 +108,7 @@ roman_pot_nhits:
needs: needs:
- ["roman_pot_simu"] - ["roman_pot_simu"]
tags: tags:
- sodium - silicon
script: script:
- root -b -q trackers/simple_tracking.cxx+ - root -b -q trackers/simple_tracking.cxx+
allow_failure: true allow_failure: true
...@@ -125,7 +116,7 @@ roman_pot_nhits: ...@@ -125,7 +116,7 @@ roman_pot_nhits:
roman_pot_eta: roman_pot_eta:
stage: benchmarks stage: benchmarks
tags: tags:
- sodium - silicon
needs: needs:
- ["roman_pot_simu"] - ["roman_pot_simu"]
script: script:
...@@ -134,10 +125,11 @@ roman_pot_eta: ...@@ -134,10 +125,11 @@ roman_pot_eta:
zdc_simulation: zdc_simulation:
stage: simulate stage: simulate
when: manual
needs: needs:
- ["get_data"] - ["get_data"]
tags: tags:
- sodium - silicon
script: script:
- cp NPDet/src/GenericDetectors/calorimeters/compact/elements.xml ./. - cp NPDet/src/GenericDetectors/calorimeters/compact/elements.xml ./.
- cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./. - cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./.
...@@ -145,8 +137,9 @@ zdc_simulation: ...@@ -145,8 +137,9 @@ zdc_simulation:
zdc_benchmark: zdc_benchmark:
stage: benchmarks stage: benchmarks
when: manual
tags: tags:
- sodium - silicon
needs: needs:
- ["zdc_simulation"] - ["zdc_simulation"]
dependencies: dependencies:
...@@ -158,10 +151,11 @@ zdc_benchmark: ...@@ -158,10 +151,11 @@ zdc_benchmark:
zdc_benchmark_info_histogram: zdc_benchmark_info_histogram:
stage: benchmarks stage: benchmarks
when: manual
needs: needs:
- ["zdc_simulation"] - ["zdc_simulation"]
tags: tags:
- sodium - silicon
dependencies: dependencies:
- zdc_simulation - zdc_simulation
script: script:
...@@ -175,7 +169,7 @@ crystal_emcal_simulation: ...@@ -175,7 +169,7 @@ crystal_emcal_simulation:
needs: needs:
- ["get_data"] - ["get_data"]
tags: tags:
- sodium - silicon
script: script:
- cp NPDet/src/GenericDetectors/calorimeters/compact/elements.xml ./. - cp NPDet/src/GenericDetectors/calorimeters/compact/elements.xml ./.
- cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./. - cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./.
...@@ -184,7 +178,7 @@ crystal_emcal_simulation: ...@@ -184,7 +178,7 @@ crystal_emcal_simulation:
crystal_benchmark: crystal_benchmark:
stage: benchmarks stage: benchmarks
tags: tags:
- sodium - silicon
needs: needs:
- ["crystal_emcal_simulation"] - ["crystal_emcal_simulation"]
script: script:
...@@ -197,66 +191,17 @@ crystal_pion_simulation: ...@@ -197,66 +191,17 @@ crystal_pion_simulation:
needs: needs:
- ["get_data"] - ["get_data"]
tags: tags:
- sodium - silicon
script: script:
- cp topside/topside.xml ./. - cd topside && ls -l
- bash calorimeters/run_simulation_crystal_pion.sh - npsim --runType batch --numberOfEvents 100 --compactFile topside.xml --inputFiles ../data/emcal_electrons.hepmc --outputFile ../sim_output/output_emcal_electrons.root
deploy_results: deploy_results:
stage: deploy stage: deploy
needs: needs:
- ["zdc_benchmark","zdc_benchmark_info_histogram"] - ["zdc_benchmark","zdc_benchmark_info_histogram"]
tags: tags:
- sodium - silicon
script: script:
- echo "deploy results!" - echo "deploy results!"
# artifacts:
# paths:
# - datasets
#track_test1:
# stage: detectors
# tags:
# - sodium
# script:
# - bash trackers/dummy_test.sh
# allow_failure: true
#
#cal_test1:
# stage: detectors
# tags:
# - sodium
# script:
# - bash calorimeters/dummy_test.sh
# allow_failure: true
#
#cal_test2:
# stage: detectors
# tags:
# - sodium
# script:
# - root -b -q calorimeters/zdc_neutrons_reader.cxx
# allow_failure: true
#pid_test1:
# stage: detectors
# tags:
# - sodium
# script:
# - bash pid/dummy_test.sh
# allow_failure: true
#pages:
# image: alpine
# when: manual
# stage: build
# script:
# - apk update && apk add doxygen graphviz ttf-ubuntu-font-family
# - cd doc && doxygen Doxyfile && mv doxygen_output/html/ ../public/
# artifacts:
# paths:
# - public # only:
# - master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment