Skip to content
Snippets Groups Projects
Commit 207c2587 authored by Chao Peng's avatar Chao Peng
Browse files

merge upstream

parents e752d32f 71a186db
Branches
No related tags found
No related merge requests found
...@@ -67,31 +67,22 @@ zdc_simulation: ...@@ -67,31 +67,22 @@ zdc_simulation:
- cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./. - cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./.
- bash calorimeters/run_simulation_zdc.sh - bash calorimeters/run_simulation_zdc.sh
rich_simulation: cal_test_1_dummy_test2:
stage: simulate
tags:
- sodium
script:
- cp NPDet/src/GenericDetectors/calorimeters/compact/elements.xml ./.
- cp NPDet/src/GenericDetectors/calorimeters/compact/materials.xml ./.
- bash pid/rich_simu.sh
#cal_test_1_dummy_test2:
# stage: benchmarks
# tags:
# - sodium
# script:
# - bash calorimeters/dummy_test2.sh
# allow_failure: true
cal_test_2_dummy_test:
stage: benchmarks stage: benchmarks
tags: tags:
- sodium - sodium
script: script:
- bash calorimeters/dummy_test.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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment