From c954f20969a87ace9bb7c746bbc26903bf44bfb9 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 20:39:57 +0000 Subject: [PATCH 1/6] if not exists input_file, exit -1 --- bin/make_dawn_views | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/make_dawn_views b/bin/make_dawn_views index 671527b..e80cd8f 100755 --- a/bin/make_dawn_views +++ b/bin/make_dawn_views @@ -5,6 +5,7 @@ # C. Peng (ANL), translate to python and add flexible run time for simulation import os +import sys import signal import subprocess import argparse @@ -84,6 +85,9 @@ dawn_env['DAWN_BATCH'] = 'a' # generate DAWN images out_dir = os.path.abspath(args.out_dir) input_file = os.path.abspath(args.input) +if (not os.path.exists(input_file)): + print('Input file does not exist!') + sys.exit(-1) #prim_file = '{}/{}.prim'.format(input_dir,args.file_tag) #prim_file = os.path.abspath(prim_file) owd = os.getcwd() -- GitLab From 9f8cbf47ce860ede57b3730c52d0caec7a0059a0 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 20:45:08 +0000 Subject: [PATCH 2/6] ls and test -f generated prim file --- views/generate_prim_files.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml index 69c25d3..df95217 100644 --- a/views/generate_prim_files.yml +++ b/views/generate_prim_files.yml @@ -4,6 +4,7 @@ view_prim:detector_only: script: - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/detector_view.prim view_prim:ev001: extends: .views @@ -12,6 +13,8 @@ view_prim:ev001: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev001 -s 1 + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/view_ev001.prim view_prim:ev002: extends: .views @@ -20,6 +23,8 @@ view_prim:ev002: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev002 -s 2 + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/view_ev002.prim view_prim:ev003: extends: .views @@ -28,6 +33,8 @@ view_prim:ev003: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev003 -s 3 + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/view_ev003.prim view_prim:ev004: extends: .views @@ -36,7 +43,8 @@ view_prim:ev004: - if: '$DETECTOR_EVENT_VIEWS == "ON"' script: - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4 - + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/view_ev004.prim view_prim:calorimeters: extends: .views @@ -45,6 +53,7 @@ view_prim:calorimeters: - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -D -t calorimeters_view - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/calorimeters_view.prim view_prim:calorimeters_ev001: extends: .views @@ -54,6 +63,8 @@ view_prim:calorimeters_ev001: script: - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev001 -s 1 + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/calorimeters_view_ev0001.prim view_prim:calorimeters_ev002: extends: .views @@ -63,4 +74,5 @@ view_prim:calorimeters_ev002: script: - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev002 -s 2 - + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - test -f ${LOCAL_DATA_PATH}/calorimeters_view_ev0002.prim -- GitLab From 962d7a6f51128778e13a2d7fcb9b17095281b7ac Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 21:04:26 +0000 Subject: [PATCH 3/6] ls before dawn_view_01:detector --- views/view1.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/view1.yml b/views/view1.yml index 4d85b5c..c04d72c 100644 --- a/views/view1.yml +++ b/views/view1.yml @@ -4,7 +4,9 @@ dawn_view_01:detector: - job: view_prim:detector_only optional: false script: - - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + dawn_view_01:ev001: extends: .views -- GitLab From 55c9c97db792e2824d1c588c9cdd79b464d18606 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 21:07:13 +0000 Subject: [PATCH 4/6] Spurious copy-paste --- views/view1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/view1.yml b/views/view1.yml index c04d72c..ea6f194 100644 --- a/views/view1.yml +++ b/views/view1.yml @@ -5,7 +5,7 @@ dawn_view_01:detector: optional: false script: - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} - - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} + - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D dawn_view_01:ev001: -- GitLab From f7079c65d0060e32baf4c951d2d7a8e97781e3ec Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 21:22:58 +0000 Subject: [PATCH 5/6] ls LOCAL_DATA_PATH before generate_prim_file --- views/generate_prim_files.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml index df95217..c9dc0f2 100644 --- a/views/generate_prim_files.yml +++ b/views/generate_prim_files.yml @@ -2,6 +2,7 @@ view_prim:detector_only: extends: .views stage: test script: + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} - test -f ${LOCAL_DATA_PATH}/detector_view.prim @@ -50,6 +51,7 @@ view_prim:calorimeters: extends: .views stage: test script: + - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -D -t calorimeters_view - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} -- GitLab From 440e1ffe43864fc2c88df7506ab88ac0c14551c1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 12 Oct 2021 21:28:11 +0000 Subject: [PATCH 6/6] view_prim:calorimeters after view_prim:detector_only --- views/generate_prim_files.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml index c9dc0f2..357592b 100644 --- a/views/generate_prim_files.yml +++ b/views/generate_prim_files.yml @@ -50,6 +50,8 @@ view_prim:ev004: view_prim:calorimeters: extends: .views stage: test + needs: + - job: view_prim:detector_only script: - ls -lrth && ls -lrth ${LOCAL_DATA_PATH} - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." -- GitLab