diff --git a/bin/make_dawn_views b/bin/make_dawn_views index 0901aa8de2c5b9043aa234df99b76767c165e2e2..9fd1d4ca4cc6c6c2d2f33f7325fd2db664547a06 100755 --- a/bin/make_dawn_views +++ b/bin/make_dawn_views @@ -58,8 +58,10 @@ parser.add_argument('-t', '--tag', type=str, parser.add_argument('--timeout', type=int, default=60, help='Timeout in seconds') + +parser.add_argument('passthrough', nargs='*') -args = parser.parse_args() +args = parser.parse_known_args() macro = 'macro/dawn_picture.mac' if args.detector_only else 'macro/dawn_picture2.mac' @@ -157,7 +159,7 @@ prim_file = os.path.abspath(prim_file) owd = os.getcwd() os.chdir(args.dawn_dir) subprocess.run(['pwd']) -subprocess.run(['./generate_eps', '-t', args.tag, '-i', prim_file]) +subprocess.run(['./generate_eps', '-t', args.tag, '-i', prim_file] + args.passthrough) subprocess.run(['ls', '-lrth']) # upload the results diff --git a/scripts/view14/generate_eps b/scripts/view14/generate_eps index f89a18fa28bf36ccc80a5a112201f8d1365e07f3..2e70ce54c6b1d48ec5770a2d07ecee347ec9520c 100755 --- a/scripts/view14/generate_eps +++ b/scripts/view14/generate_eps @@ -36,7 +36,7 @@ INPUT_FILE="../../g4_0000.prim" POSITIONAL=() while [[ $# -gt 0 ]] do - key="$1" + key="$1"tag case $key in -h|--help) @@ -102,7 +102,8 @@ make_slice(){ rm "${FILE_TAG}_temp0.prim" rm "${FILE_TAG}.prim" } -for zzz in $(seq 100 200 2000) ; + +for zzz in $@ ; do make_slice ${zzz} done diff --git a/views/view14.yml b/views/view14.yml index de135eb04d6eb0f39594a5551ebc3505fef1406c..9f6c62096f2ee7b5b0ea52b9b91d52e026e4acbe 100644 --- a/views/view14.yml +++ b/views/view14.yml @@ -1,7 +1,10 @@ dawn_view_14:detector: extends: .views script: - - ./bin/make_dawn_views -t view14 -d scripts/view14 -D + - ./bin/make_dawn_views -t view14 -d scripts/view14 -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_14: stage: collect @@ -12,4 +15,3 @@ view_14: script: - ls -lrth * - ls -lrth images/* -