diff --git a/scripts/view12/generate_eps b/scripts/view12/generate_eps index c70aa7255ef38c4aa75c620592456fbe62eedf65..302f1123140f1d3bb3ba2cd269ffa14fa3fc531a 100755 --- a/scripts/view12/generate_eps +++ b/scripts/view12/generate_eps @@ -18,7 +18,7 @@ tan () function print_the_help { - echo "USAGE: $0 -i <PRIM_FILE> " + echo "USAGE: $0 -i <PRIM_FILE> <slices ...> " echo " OPTIONS: " echo " -t,--tag filename tag (default: view1)" exit @@ -48,12 +48,16 @@ do shift # past argument shift # past value ;; - *) # unknown option + -[a-zA-Z]*) # unknown option #POSITIONAL+=("$1") # save it in an array for later echo "unknown option $1" print_the_help shift # past argument ;; + *) # positional options + #POSITIONAL+=("$1") # save it in an array for later + shift # past argument + ;; esac done set -- "${POSITIONAL[@]}" # restore positional parameters @@ -90,7 +94,8 @@ make_slice(){ rm "${FILE_TAG}_temp0.prim" rm "${FILE_TAG}.prim" } -for zzz in $(seq 50 50 2000) ; + +for zzz in $@ ; do make_slice ${zzz} & done diff --git a/scripts/view15/generate_eps b/scripts/view15/generate_eps index bf1d772ecadfaeac8f9bf506e501c04e6d11fa48..8f7dc373ae6cd0c3de3a0a705f4fc0006dfd0a02 100755 --- a/scripts/view15/generate_eps +++ b/scripts/view15/generate_eps @@ -23,7 +23,7 @@ function print_the_help { - echo "USAGE: $0 -i <PRIM_FILE> " + echo "USAGE: $0 -i <PRIM_FILE> <slices ...> " echo " OPTIONS: " echo " -t,--tag filename tag (default: view1)" exit @@ -53,12 +53,16 @@ do shift # past argument shift # past value ;; - *) # unknown option + -[a-zA-Z]*) # unknown option #POSITIONAL+=("$1") # save it in an array for later echo "unknown option $1" print_the_help shift # past argument ;; + *) # positional options + #POSITIONAL+=("$1") # save it in an array for later + shift # past argument + ;; esac done set -- "${POSITIONAL[@]}" # restore positional parameters @@ -104,7 +108,7 @@ make_slice(){ rm "${FILE_TAG}.prim" } -for zzz in $(seq 100 200 2000) ; +for zzz in $@ ; do make_slice ${zzz} done diff --git a/views/view12.yml b/views/view12.yml index 13316030e0f72f20640f66739089ecb0d7896ea7..3f5ee67f7cb343b267d7e6de5b9c2e9a08d0e6f0 100644 --- a/views/view12.yml +++ b/views/view12.yml @@ -1,7 +1,10 @@ dawn_view_12:detector: extends: .views script: - - ./bin/make_dawn_views -t view12 -d scripts/view12 -D + - ./bin/make_dawn_views -t view12 -d scripts/view12 -D -- ${SLICE} + parallel: + matrix: + - SLICE: ["50", "100", "150", "200", "250", "300", "350", "400", "450", "500", "550", "600", "650", "700", "750", "800", "850", "900", "950", "1000", "1050", "1100", "1150", "1200", "1250", "1300", "1350", "1400", "1450", "1500", "1550", "1600", "1650", "1700", "1750", "1800", "1850", "1900", "1950", "2000"] view_12: stage: collect diff --git a/views/view14.yml b/views/view14.yml index 9f6c62096f2ee7b5b0ea52b9b91d52e026e4acbe..500592d41551d6a63d8085a14b9dfb4e467481ce 100644 --- a/views/view14.yml +++ b/views/view14.yml @@ -15,3 +15,4 @@ view_14: script: - ls -lrth * - ls -lrth images/* + diff --git a/views/view15.yml b/views/view15.yml index 8e6bd133157dd795c6e53bf09af4aadee843b3b8..9671904d61e5c47b698defe5bf5c437f6ab618d1 100644 --- a/views/view15.yml +++ b/views/view15.yml @@ -1,7 +1,10 @@ dawn_view_15:detector: extends: .views script: - - ./bin/make_dawn_views -t view15 -d scripts/view15 -D + - ./bin/make_dawn_views -t view15 -d scripts/view15 -D -- ${SLICE} + parallel: + matrix: + - SLICE: ["150", "200", "250", "300", "350", "400", "450", "500", "550", "600", "650", "700", "750", "800", "850", "900", "950", "1000", "1050", "1100", "1150", "1200", "1250", "1300", "1350", "1400", "1450", "1500", "1550", "1600", "1650", "1700", "1750", "1800", "1850", "1900", "1950", "2000"] view_15: stage: collect