Skip to content

Commit 812a30d

Browse files
SimonKrughoffSimonKrughoff
committed
Add switches to dataset runner scripts
These switches allow processing and verification steps to be turned off.
1 parent 73c25b2 commit 812a30d

File tree

8 files changed

+249
-66
lines changed

8 files changed

+249
-66
lines changed

‎examples/processData.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ASTROMDIR=astrometry_net_data
1111

1212
usage() {
1313
print_error
14-
print_error "Usage: $0 [-cmvfiear] [-h] [-- <options to validateDrp.py>]"
14+
print_error "Usage: $0 [-cmvfiear] [-h]"
1515
print_error
1616
print_error "Specifc options:"
1717
print_error " -c Camera"

‎examples/runCfhtQuickTest.sh‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,44 @@ CAMERA=CfhtQuick
77
CONFIG_FILE="${PRODUCT_DIR}/config/cfhtConfig.py"
88
MAPPER=lsst.obs.cfht.MegacamMapper
99

10-
"${PRODUCT_DIR}/examples/processData.sh" \
11-
-c "$CAMERA" \
12-
-m "$MAPPER" \
13-
-v "$VALIDATION_DATA_DIR" \
14-
-f "$CONFIG_FILE" \
15-
-- "$@"
16-
"${PRODUCT_DIR}/examples/validateRepo.sh" \
17-
-c "$CAMERA" \
18-
-- "$@"
10+
print_error() {
11+
>&2 echo "$@"
12+
}
13+
14+
DOPROCESS=true
15+
DOVERIFY=true
16+
17+
usage() {
18+
print_error
19+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
20+
print_error
21+
print_error "Specifc options:"
22+
print_error " -p Skip processing?"
23+
print_error " -v Skip verification?"
24+
print_error " -h show this message"
25+
exit 1
26+
}
27+
28+
# thank OSX for not including getopt
29+
while getopts "vph" option; do
30+
case "$option" in
31+
p) DOPROCESS=false;;
32+
v) DOVERIFY=false;;
33+
h) usage;;
34+
esac
35+
done
36+
shift $((OPTIND-1))
37+
38+
if [[ $DOPROCESS == true ]] ; then
39+
"${PRODUCT_DIR}/examples/processData.sh" \
40+
-c "$CAMERA" \
41+
-m "$MAPPER" \
42+
-v "$VALIDATION_DATA_DIR" \
43+
-f "$CONFIG_FILE"
44+
fi
45+
46+
if [[ $DOVERIFY = true ]] ; then
47+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
48+
-c "$CAMERA" \
49+
-- "$@"
50+
fi

‎examples/runCfhtTest.sh‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,44 @@ CAMERA=Cfht
77
CONFIG_FILE="${PRODUCT_DIR}/config/cfhtConfig.py"
88
MAPPER=lsst.obs.cfht.MegacamMapper
99

10-
"${PRODUCT_DIR}/examples/processData.sh" \
11-
-c "$CAMERA" \
12-
-m "$MAPPER" \
13-
-v "$VALIDATION_DATA_DIR" \
14-
-f "$CONFIG_FILE" \
15-
-- "$@"
16-
"${PRODUCT_DIR}/examples/validateRepo.sh" \
17-
-c "$CAMERA" \
18-
-- "$@"
10+
print_error() {
11+
>&2 echo "$@"
12+
}
13+
14+
DOPROCESS=true
15+
DOVERIFY=true
16+
17+
usage() {
18+
print_error
19+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
20+
print_error
21+
print_error "Specifc options:"
22+
print_error " -p Skip processing?"
23+
print_error " -v Skip verification?"
24+
print_error " -h show this message"
25+
exit 1
26+
}
27+
28+
# thank OSX for not including getopt
29+
while getopts "vph" option; do
30+
case "$option" in
31+
p) DOPROCESS=false;;
32+
v) DOVERIFY=false;;
33+
h) usage;;
34+
esac
35+
done
36+
shift $((OPTIND-1))
37+
38+
if [[ $DOPROCESS == true ]] ; then
39+
"${PRODUCT_DIR}/examples/processData.sh" \
40+
-c "$CAMERA" \
41+
-m "$MAPPER" \
42+
-v "$VALIDATION_DATA_DIR" \
43+
-f "$CONFIG_FILE"
44+
fi
45+
46+
if [[ $DOVERIFY = true ]] ; then
47+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
48+
-c "$CAMERA" \
49+
-- "$@"
50+
fi

‎examples/runDecamQuickTest.sh‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,44 @@ CAMERA=DecamQuick
77
CONFIG_FILE="${PRODUCT_DIR}/config/decamConfig.py"
88
MAPPER=lsst.obs.decam.DecamMapper
99

10-
"${PRODUCT_DIR}/examples/processData.sh" \
11-
-c "$CAMERA" \
12-
-m "$MAPPER" \
13-
-v "$VALIDATION_DATA_DIR" \
14-
-f "$CONFIG_FILE" \
15-
-i ingestImagesDecam.py \
16-
-- "$@"
17-
"${PRODUCT_DIR}/examples/validateRepo.sh" \
18-
-c "$CAMERA" \
19-
-- "$@"
10+
print_error() {
11+
>&2 echo "$@"
12+
}
13+
14+
DOPROCESS=true
15+
DOVERIFY=true
16+
17+
usage() {
18+
print_error
19+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
20+
print_error
21+
print_error "Specifc options:"
22+
print_error " -p Skip processing?"
23+
print_error " -v Skip verification?"
24+
print_error " -h show this message"
25+
exit 1
26+
}
27+
28+
# thank OSX for not including getopt
29+
while getopts "vph" option; do
30+
case "$option" in
31+
p) DOPROCESS=false;;
32+
v) DOVERIFY=false;;
33+
h) usage;;
34+
esac
35+
done
36+
shift $((OPTIND-1))
37+
38+
if [[ $DOPROCESS == true ]] ; then
39+
"${PRODUCT_DIR}/examples/processData.sh" \
40+
-c "$CAMERA" \
41+
-m "$MAPPER" \
42+
-v "$VALIDATION_DATA_DIR" \
43+
-f "$CONFIG_FILE"
44+
fi
45+
46+
if [[ $DOVERIFY = true ]] ; then
47+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
48+
-c "$CAMERA" \
49+
-- "$@"
50+
fi

‎examples/runDecamTest.sh‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,44 @@ CAMERA=Decam
77
CONFIG_FILE="${PRODUCT_DIR}/config/decamConfig.py"
88
MAPPER=lsst.obs.decam.DecamMapper
99

10-
"${PRODUCT_DIR}/examples/processData.sh" \
11-
-c "$CAMERA" \
12-
-m "$MAPPER" \
13-
-v "$VALIDATION_DATA_DIR" \
14-
-f "$CONFIG_FILE" \
15-
-i ingestImagesDecam.py \
16-
-- "$@"
17-
"${PRODUCT_DIR}/examples/validateRepo.py" \
18-
-c "$CAMERA" \
19-
-- "$@"
10+
print_error() {
11+
>&2 echo "$@"
12+
}
13+
14+
DOPROCESS=true
15+
DOVERIFY=true
16+
17+
usage() {
18+
print_error
19+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
20+
print_error
21+
print_error "Specifc options:"
22+
print_error " -p Skip processing?"
23+
print_error " -v Skip verification?"
24+
print_error " -h show this message"
25+
exit 1
26+
}
27+
28+
# thank OSX for not including getopt
29+
while getopts "vph" option; do
30+
case "$option" in
31+
p) DOPROCESS=false;;
32+
v) DOVERIFY=false;;
33+
h) usage;;
34+
esac
35+
done
36+
shift $((OPTIND-1))
37+
38+
if [[ $DOPROCESS == true ]] ; then
39+
"${PRODUCT_DIR}/examples/processData.sh" \
40+
-c "$CAMERA" \
41+
-m "$MAPPER" \
42+
-v "$VALIDATION_DATA_DIR" \
43+
-f "$CONFIG_FILE"
44+
fi
45+
46+
if [[ $DOVERIFY = true ]] ; then
47+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
48+
-c "$CAMERA" \
49+
-- "$@"
50+
fi

‎examples/runHscQuickTest.sh‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,44 @@ exit 1
1414

1515
ASTROMDIR=sdss-dr9-fink-v5b
1616

17-
"${PRODUCT_DIR}/examples/processData.sh" \
18-
-c "$CAMERA" \
19-
-m "$MAPPER" \
20-
-v "$VALIDATION_DATA_DIR" \
21-
-f "$CONFIG_FILE" \
22-
-e "fits" \
23-
-a "$ASTROMDIR" \
24-
-d "$CALIB_DATA" \
25-
-r \
26-
-- "$@"
27-
"${PRODUCT_DIR}/examples/validateRepo.sh" \
28-
-c "$CAMERA" \
29-
-- "$@"
17+
print_error() {
18+
>&2 echo "$@"
19+
}
20+
21+
DOPROCESS=true
22+
DOVERIFY=true
23+
24+
usage() {
25+
print_error
26+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
27+
print_error
28+
print_error "Specifc options:"
29+
print_error " -p Skip processing?"
30+
print_error " -v Skip verification?"
31+
print_error " -h show this message"
32+
exit 1
33+
}
34+
35+
# thank OSX for not including getopt
36+
while getopts "vph" option; do
37+
case "$option" in
38+
p) DOPROCESS=false;;
39+
v) DOVERIFY=false;;
40+
h) usage;;
41+
esac
42+
done
43+
shift $((OPTIND-1))
44+
45+
if [[ $DOPROCESS == true ]] ; then
46+
"${PRODUCT_DIR}/examples/processData.sh" \
47+
-c "$CAMERA" \
48+
-m "$MAPPER" \
49+
-v "$VALIDATION_DATA_DIR" \
50+
-f "$CONFIG_FILE"
51+
fi
52+
53+
if [[ $DOVERIFY = true ]] ; then
54+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
55+
-c "$CAMERA" \
56+
-- "$@"
57+
fi

‎examples/runHscTest.sh‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,44 @@ CONFIG_FILE="${PRODUCT_DIR}/config/hscConfig.py"
99
MAPPER=lsst.obs.hsc.HscMapper
1010
ASTROMDIR=sdss-dr9-fink-v5b
1111

12-
"${PRODUCT_DIR}/examples/processData.sh" \
13-
-c "$CAMERA" \
14-
-m "$MAPPER" \
15-
-v "$VALIDATION_DATA_DIR" \
16-
-f "$CONFIG_FILE" \
17-
-e "fits" \
18-
-a "$ASTROMDIR" \
19-
-d "$CALIB_DATA" \
20-
-r \
21-
-- "$@"
22-
"${PRODUCT_DIR}/examples/validateRepo.sh" \
23-
-c "$CAMERA" \
24-
-- "$@"
12+
print_error() {
13+
>&2 echo "$@"
14+
}
15+
16+
DOPROCESS=true
17+
DOVERIFY=true
18+
19+
usage() {
20+
print_error
21+
print_error "Usage: $0 [-pv] [-h] [-- <extra options to validateDrp.py>]"
22+
print_error
23+
print_error "Specifc options:"
24+
print_error " -p Skip processing?"
25+
print_error " -v Skip verification?"
26+
print_error " -h show this message"
27+
exit 1
28+
}
29+
30+
# thank OSX for not including getopt
31+
while getopts "vph" option; do
32+
case "$option" in
33+
p) DOPROCESS=false;;
34+
v) DOVERIFY=false;;
35+
h) usage;;
36+
esac
37+
done
38+
shift $((OPTIND-1))
39+
40+
if [[ $DOPROCESS == true ]] ; then
41+
"${PRODUCT_DIR}/examples/processData.sh" \
42+
-c "$CAMERA" \
43+
-m "$MAPPER" \
44+
-v "$VALIDATION_DATA_DIR" \
45+
-f "$CONFIG_FILE"
46+
fi
47+
48+
if [[ $DOVERIFY = true ]] ; then
49+
"${PRODUCT_DIR}/examples/validateRepo.sh" \
50+
-c "$CAMERA" \
51+
-- "$@"
52+
fi

‎examples/validateRepo.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ WORKSPACE=${CAMERA}
3636
OUTPUT=${WORKSPACE}/output
3737

3838
if ! [ -d "${OUTPUT}" ]; then
39-
print_error "Repository does not exist. Please run processData.sh first."
39+
print_error "Repository does not exist. Please run processData.sh first."
40+
exit 1
4041
fi
4142

4243
# YAML config file for validation configuration

0 commit comments

Comments
 (0)