views/view2.yml

 dawn_view_02:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view02 -d scripts/view2 -D
+
+dawn_view_02:ev001:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev001
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view02_ev001 -d scripts/view2 -s 1
+
 dawn_view_02:ev002:
   extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev002
+      optional: true
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view02_ev002 -d scripts/view2 -s 2
+
+dawn_view_02:ev003:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev003
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev003.prim  -t view02_ev003 -d scripts/view2 -s 3
 
 view_02:
-  stage: test
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
-    - ["dawn_view_02:detector", "dawn_view_02:ev002"]
+    - job: dawn_view_02:detector
+      optional: false
+    - job: dawn_view_02:ev002
+      optional: true
+    - job: dawn_view_02:ev003
+      optional: true
   script:
     - ls -lrth *
     - ls -lrth images/*

views/view20.yml

+dawn_view_20:detector:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters
+      optional: false
+  script:
+    - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+    - ./bin/make_dawn_views -c ${DETECTOR_PATH}/calorimeters.xml -i ${LOCAL_DATA_PATH}/calorimeters_view.prim -t view20 -d scripts/view20 -D
+
+dawn_view_20:ev001:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters_ev001
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev001.prim -t view20_ev001 -d scripts/view20 -s 1
+
+dawn_view_20:ev002:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters_ev002
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev002.prim  -t view20_ev002 -d scripts/view20 -s 2
+
+view_20:
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
+  needs:
+    - job: dawn_view_20:detector
+      optional: false
+    - job: dawn_view_20:ev001
+      optional: true
+    - job: dawn_view_20:ev002
+      optional: true
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+

views/view3.yml

 dawn_view_03:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view03 -d scripts/view3 -D
+
+#dawn_view_03:ev001:
+#  extends: .views
+#  needs:
+#    - job: view_prim:ev001
+#      optional: true
+#  script:
+#    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view03_ev001 -d scripts/view3 -s 1
+
 dawn_view_03:ev002:
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view03_ev002 -d scripts/view3 -s 2
 
 view_03:
-  stage: test
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
-    - ["dawn_view_03:detector", "dawn_view_03:ev002"]
+    - job: dawn_view_03:detector
+      optional: false
+    - job: dawn_view_03:ev002
+      optional: true
+    #- ["dawn_view_03:detector", "dawn_view_03:ev001", "dawn_view_03:ev002"]
   script:
     - ls -lrth *
     - ls -lrth images/*

views/view6.yml

 dawn_view_06:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view06 -d scripts/view6 -D
+
+dawn_view_06:ev001:
+  extends: .views
+  needs:
+    - job: view_prim:ev001
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view06_ev001 -d scripts/view6 -s 1
+
+dawn_view_06:ev002:
+  extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view06_ev002 -d scripts/view6 -s 2
+
+dawn_view_06:ev003:
+  extends: .views
+  needs:
+    - job: view_prim:ev003
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev003.prim  -t view06_ev003 -d scripts/view6 -s 3
+
 dawn_view_06:ev004:
   extends: .views
+  needs:
+    - job: view_prim:ev004
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view02_ev004 -d scripts/view2 -s 4
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH} -t view06_ev004 -d scripts/view6 -s 4
 
 view_06:
-  stage: test
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
-    - ["dawn_view_06:detector", "dawn_view_06:ev004"]
+    - job: dawn_view_06:detector
+      optional: false
+    - job: dawn_view_06:ev001
+      optional: true
+    - job: dawn_view_06:ev002
+      optional: true
+    - job: dawn_view_06:ev003 
+      optional: true
+    - job: dawn_view_06:ev004
+      optional: true
+    #- ["dawn_view_06:detector", "dawn_view_06:ev001", "dawn_view_06:ev002", "dawn_view_06:ev003", "dawn_view_06:ev004"]
   script:
     - ls -lrth *
     - ls -lrth images/*

views/view7.yml

 dawn_view_07:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view07 -d scripts/view7 -D
+
 dawn_view_07:ev002:
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view07_ev002 -d scripts/view7 -s 2
+
+dawn_view_07:ev003:
+  extends: .views
+  needs:
+    - job: view_prim:ev003
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view07_ev003 -d scripts/view7 -s 3
 
 view_07:
-  stage: test
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
-    - ["dawn_view_07:detector", "dawn_view_07:ev002"]
+    - job: dawn_view_07:detector
+      optional: false
+    - job: dawn_view_07:ev002
+      optional: true
+    - job: dawn_view_07:ev003
+      optional: true
   script:
     - ls -lrth *
     - ls -lrth images/*