Modified calorimeters_config yml file

.gitlab-ci.yml

@@ -31,25 +31,6 @@ get_data:
     - mkdir -p results
     - mkdir -p sim_output
 
-#generate_config:
-#  stage: ci_gen
-#  tags:
-#    - silicon
-#  script:
-#    - ./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 pid_test_   -i pid > results/pid_config.yml
-
-      #cal_test_3_zdc_neutrons_reader:
-      #stage: benchmarks
-      #tags:
-      #- silicon
-      #needs: 
-      #- ["zdc_simulation"]
-      #script:
-      #- root -b -q calorimeters/zdc_neutrons_reader.cxx
-      #allow_failure: true
-
 roman_pot_simu:
   stage: simulate
   needs: 
@@ -81,83 +62,13 @@ roman_pot_eta:
     - root -b -q trackers/roman_pot_hit_eta.cxx+
   allow_failure: true
 
-    #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
-
-    #zdc_benchmark:
-    #stage: benchmarks
-    #tags:
-    #- silicon
-    #needs: 
-    #- ["zdc_simulation"]
-    #dependencies:
-    #- zdc_simulation
-    #script:
-    #- ls -lrth sim_output
-    #- root -b -q calorimeters/simple_checking.cxx+
-    #allow_failure: true
-
-    #zdc_benchmark_info_histogram:
-    #stage: benchmarks
-    #needs: 
-    #- ["zdc_simulation"]
-    #tags:
-    #- silicon
-    #dependencies:
-    #- zdc_simulation
-    #script:
-    #- cp NPDet/src/detectors/calorimeters/compact/elements.xml calorimeters/
-    #- cp NPDet/src/detectors/calorimeters/compact/materials.xml calorimeters/
-    #- root -b -q calorimeters/simple_info_plot_histograms.cxx+
-    #allow_failure: true
-
-crystal_emcal_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_crystal.sh
-
-crystal_benchmark:
-  stage: benchmarks
-  tags:
-    - silicon
-  needs:
-    - ["crystal_emcal_simulation"]
-  script:
-    - ls -lrth sim_output
-    - root -b -q calorimeters/simple_checking_crystal.cxx+
-  allow_failure: true
-
-crystal_pion_simulation:
-  stage: simulate
-  needs:
-    - ["get_data"]
-  tags:
-    - silicon
-  script:
-    - cd topside  && ls -l
-    - npsim --runType batch --numberOfEvents 100 --compactFile topside.xml --inputFiles  ../data/emcal_electrons.hepmc  --outputFile  ../sim_output/output_emcal_electrons.root
-
 include:
   - local: 'calorimeters/calorimeters_config.yml'
 
 deploy_results:
   stage: deploy
-    #needs:
-    #- ["zdc_benchmark","zdc_benchmark_info_histogram"]
+    needs:
+    - ["ben_emcal_barrel_electrons"]
   tags:
     - silicon
   script:
@@ -177,4 +88,3 @@ pages:
     paths:
       - public
 
-

calorimeters/calorimeters_config.yml

+#####################
+# Simulations
+# - Generate datasets
+# - Run Geant4
+# - Run Juggler
+#####################
+
 sim_emcal_barrel_electrons:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
   stage: simulate
   tags:
-    - sodium
+    - silicon
   artifacts:
     expire_in: 20 weeks
     paths:
@@ -12,8 +19,46 @@ sim_emcal_barrel_electrons:
     - bash calorimeters/run_emcal_barrel_electrons.sh
   allow_failure: true
 
+crystal_emcal_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_crystal.sh
+
+crystal_pion_simulation:
+  stage: simulate
+  needs:
+    - ["get_data"]
+  tags:
+    - silicon
+  script:
+    - cd topside  && ls -l
+    - npsim --runType batch --numberOfEvents 100 --compactFile 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
+
+###################
+# Benchmarks
+###################
+
 ben_emcal_barrel_electrons:
   stage: benchmarks
+  tags:
+    - silicon
   needs:
     - ["sim_emcal_barrel_electrons"]
   script:
@@ -21,6 +66,17 @@ ben_emcal_barrel_electrons:
     - root -b -q calorimeters/scripts/emcal_barrel_electrons_analysis.cxx+
   allow_failure: true
 
+crystal_benchmark:
+  stage: benchmarks
+  tags:
+    - silicon
+  needs:
+    - ["crystal_emcal_simulation"]
+  script:
+    - ls -lrth sim_output
+    - root -b -q calorimeters/simple_checking_crystal.cxx+
+  allow_failure: true
+
     #cal_test_3_zdc_neutrons_reader:
     #stage: benchmarks
     #tags:
@@ -32,3 +88,30 @@ ben_emcal_barrel_electrons:
       #    - results/
       #allow_failure: true
 
+    #zdc_benchmark:
+    #stage: benchmarks
+    #tags:
+    #- silicon
+    #needs: 
+    #- ["zdc_simulation"]
+    #dependencies:
+    #- zdc_simulation
+    #script:
+    #- ls -lrth sim_output
+    #- root -b -q calorimeters/simple_checking.cxx+
+    #allow_failure: true
+
+    #zdc_benchmark_info_histogram:
+    #stage: benchmarks
+    #needs: 
+    #- ["zdc_simulation"]
+    #tags:
+    #- silicon
+    #dependencies:
+    #- zdc_simulation
+    #script:
+    #- cp NPDet/src/detectors/calorimeters/compact/elements.xml calorimeters/
+    #- cp NPDet/src/detectors/calorimeters/compact/materials.xml calorimeters/
+    #- root -b -q calorimeters/simple_info_plot_histograms.cxx+
+    #allow_failure: true
+