Restructuring repo

benchmarks/calorimeters/config.yml

@@ -5,99 +5,66 @@
 # - Run Juggler
 #####################
 
-sim:emcal_barrel_pions:
-  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+cal_sim:emcal_barrel_pions:
+  extends: .det_benchmark
   stage: simulate
-  artifacts:
-    expire_in: 20 weeks
-    paths:
-      - results/
   script:
     - bash benchmarks/calorimeters/run_emcal_barrel_pions.sh
   allow_failure: true
 
-sim:emcal_barrel_electrons:
-  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+cal_sim:emcal_barrel_electrons:
+  extends: .det_benchmark
   stage: simulate
-  artifacts:
-    expire_in: 20 weeks
-    paths:
-      - results/
   script:
     - bash benchmarks/calorimeters/run_emcal_barrel_electrons.sh
   allow_failure: true
 
-sim:crystal_emcal:
+cal_sim:crystal_emcal:
+  extends: .det_benchmark
   stage: simulate
-  needs: 
-    - ["get_data"]
-  tags:
-    - silicon
   script:
     - bash benchmarks/calorimeters/run_simulation_crystal.sh
 
-crystal_pion_simulation:
+cal_sim:crystal_pion:
+  extends: .det_benchmark
   stage: simulate
-  needs:
-    - ["get_data"]
-  tags:
-    - silicon
   script:
     - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
 
-    #zdc_simulation:
-    #stage: simulate
-    #needs: 
-    #- ["get_data"]
-    #tags:
-    #- silicon
-    #script:
-    #- cp NPDet/src/detectors/calorimeters/compact/elements.xml ./.
-    #- cp NPDet/src/detectors/calorimeters/compact/materials.xml ./.
-    #- bash calorimeters/run_simulation_zdc.sh
+cal_sim:zdc:
+  extends: .det_benchmark
+  stage: simulate
+  script:
+    - bash benchmarks/calorimeters/run_simulation_zdc.sh
 
 ###################
 # Benchmarks
 ###################
 
-ben_emcal_barrel_pions:
+cal_bench:emcal_barrel_pions:
+  extends: .det_benchmark
   stage: benchmarks
-  tags:
-    - silicon
-  artifacts:
-    expire_in: 20 weeks
-    paths:
-      - results/
   needs:
-    - ["sim_emcal_barrel_pions"]
+    - ["cal_sim:emcal_barrel_pions"]
   script:
-    - ls -lrth sim_output
     - root -b -q calorimeters/scripts/emcal_barrel_pions_analysis.cxx+
   allow_failure: true
 
-ben_emcal_barrel_electrons:
+cal_bench:emcal_barrel_electrons:
+  extends: .det_benchmark
   stage: benchmarks
-  tags:
-    - silicon
-  artifacts:
-    expire_in: 20 weeks
-    paths:
-      - results/
   needs:
-    - ["sim_emcal_barrel_electrons"]
+    - ["cal_sim:emcal_barrel_electrons"]
   script:
-    - ls -lrth sim_output
     - root -b -q calorimeters/scripts/emcal_barrel_electrons_analysis.cxx+
   allow_failure: true
 
-crystal_benchmark:
+cal_bench:crystal_benchmark:
+  extends: .det_benchmark
   stage: benchmarks
-  tags:
-    - silicon
   needs:
-    - ["crystal_emcal_simulation"]
+    - ["cal_sim:crystal_emcal"]
   script:
-    - ls -lrth sim_output
     - root -b -q calorimeters/simple_checking_crystal.cxx+
   allow_failure: true
 
@@ -112,27 +79,20 @@ crystal_benchmark:
       #    - results/
       #allow_failure: true
 
-zdc_benchmark:
+cal_bench:zdc_benchmark:
+  extends: .det_benchmark
   stage: benchmarks
-  tags:
-    - silicon
   needs: 
-    - ["zdc_simulation"]
-  dependencies:
-    - zdc_simulation
+    - ["cal_sim:zdc"]
   script:
-    - ls -lrth sim_output
     - root -b -q calorimeters/simple_checking.cxx+
   allow_failure: true
 
-zdc_benchmark_info_histogram:
+cal_bench:zdc_benchmark_info_histogram:
+  extends: .det_benchmark
   stage: benchmarks
   needs: 
-    - ["zdc_simulation"]
-  tags:
-    - silicon
-  dependencies:
-    - zdc_simulation
+    - ["cal_sim:zdc"]
   script:
     - root -b -q calorimeters/simple_info_plot_histograms.cxx+
   allow_failure: true