Make ingestion of instcals explicit.

Avoiding using the default value of --filetype makes it possible to
change it safely.

examples/processData.sh

@@ -12,14 +12,15 @@ ASTROMDIR=astrometry_net_data
 
 usage() {
     print_error
-    print_error "Usage: $0 [-cmvfiear] [-h]"
+    print_error "Usage: $0 [-cmvfioear] [-h]"
     print_error
     print_error "Specifc options:"
     print_error "   -c          Camera"
     print_error "   -m          Mapper"
     print_error "   -v          Validation data"
     print_error "   -f          Config file"
     print_error "   -i          Ingest script"
+    print_error "   -o          Extra options for ingest script"
     print_error "   -e          Extension to ingest"
     print_error "   -a          Name of astrometry to load"
     print_error "   -r          Reduce from raw?  Implies there is a CALIB directory"
@@ -28,13 +29,14 @@ usage() {
     exit 1
 }
 
-while getopts "c:m:v:f:i:e:a:d:hr" option; do
+while getopts "c:m:v:f:i:o:e:a:d:hr" option; do
     case "$option" in
         c)  CAMERA="$OPTARG";;
         m)  MAPPER="$OPTARG";;
         v)  VALIDATION_DATA="$OPTARG";;
         f)  CONFIG_FILE="$OPTARG";;
         i)  INGEST="$OPTARG";;
+        o)  INGESTARGS="$OPTARG";;
         e)  INGESTEXT="$OPTARG";;
         a)  ASTROMDIR="$OPTARG";;
         r)  DOCALIB=true;;
@@ -67,7 +69,7 @@ echo "$MAPPER" > "${INPUT}"/_mapper
 
 # ingest raw data
 RAWDATA=${VALIDATION_DATA}
-$INGEST "${INPUT}" "${RAWDATA}"/*."${INGESTEXT}" --mode link
+$INGEST "${INPUT}" "${RAWDATA}"/*."${INGESTEXT}" --mode link ${INGESTARGS}
 
 # set up calibs
 if [[ $DOCALIB == true ]]; then

examples/runDecamQuickTest.sh

@@ -43,6 +43,7 @@ if [[ $DOPROCESS == true ]]; then
         -m "$MAPPER" \
         -v "$VALIDATION_DATA_DIR" \
         -f "$CONFIG_FILE" \
+        -o "--filetype instcal" \
         -i ingestImagesDecam.py
 fi
 

examples/runDecamTest.sh

@@ -43,10 +43,11 @@ if [[ $DOPROCESS == true ]]; then
         -m "$MAPPER" \
         -v "$VALIDATION_DATA_DIR" \
         -f "$CONFIG_FILE" \
+        -o "--filetype instcal" \
         -i ingestImagesDecam.py
 fi
 
-if [[ $DOVERIFY = true ]]; then
+if [[ $DOVERIFY == true ]]; then
     "${PRODUCT_DIR}/examples/validateRepo.sh" \
         -c "$CAMERA" \
         -- "$@"