Changeset 9189

Timestamp:

Oct 3, 2006, 6:35:19 PM (20 years ago)

Author:

jhoblitt

Message:

add obstype to raw* tables

Location:

trunk

Files:

• dbconfig/tasks.md (modified) (4 diffs)
• ippTools/configure.ac (modified) (1 diff)
• ippTools/scripts/regtest.sh (modified) (1 diff)
• ippTools/src/regtool.c (modified) (4 diffs)
• ippTools/src/regtoolConfig.c (modified) (2 diffs)

trunk/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.81 2006-10-04 03:55:31 jhoblitt Exp $
+# $Id: tasks.md,v 1.82 2006-10-04 04:31:58 jhoblitt Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -78 +78 @@
     ccd_temp    F32         0.0
     posang      F64         0.0 
+    obstype     STR         64
 END
 
@@ -99 +100 @@
     ccd_temp    F32         0.0
     posang      F64         0.0 
+    obstype     STR         64
 END
 
@@ -119 +121 @@
     ccd_temp    F32         0.0
     posang      F64         0.0 
+    obstype     STR         64
 END
 

trunk/ippTools/configure.ac

@@ -16 +16 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.42]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.43]) 
 
 AC_PROG_PERL_MODULES(

trunk/ippTools/scripts/regtest.sh

@@ -21 +21 @@
 
 for ID in `seq 0 3`; do
-    $p0tool -updateimfile -exp_tag t10 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
+    $p0tool -updateimfile -exp_tag t10 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -obstype dog || exit 1
 done;
 
-$p0tool -updateexp -exp_tag t10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 $* || exit 1
+$p0tool -updateexp -exp_tag t10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -obstype dog $* || exit 1
 
 for ID in `seq 0 3`; do
-    $p0tool -updateimfile -exp_tag t11 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
+    $p0tool -updateimfile -exp_tag t11 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -obstype dog || exit 1
 done;
 
-$p0tool -updateexp -exp_tag t11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 $* || exit 1
+$p0tool -updateexp -exp_tag t11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -obstype dog $* || exit 1

trunk/ippTools/src/regtool.c

@@ -794 +794 @@
         return false;
     }
+    psString obstype = psMetadataLookupStr(&status, config->args, "-obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -obstype");
+        return false;
+    }
+    if (!obstype) {
+        psError(PS_ERR_UNKNOWN, true, "-obstype is required");
+        return false;
+    }
 
     return rawDetrendExpRowAlloc(
@@ -812 +821 @@
         az,
         ccd_temp,
-        posang
+        posang,
+        obstype
     );
 }
@@ -937 +947 @@
     if (isnan(posang)) {
         psError(PS_ERR_UNKNOWN, true, "-posang is required");
+        return false;
+    }
+    psString obstype = psMetadataLookupStr(&status, config->args, "-obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -obstype");
+        return false;
+    }
+    if (!obstype) {
+        psError(PS_ERR_UNKNOWN, true, "-obstype is required");
         return false;
     }
@@ -957 +976 @@
         az,
         ccd_temp,
-        posang
+        posang,
+        obstype
     );
 }

trunk/ippTools/src/regtoolConfig.c

@@ -79 +79 @@
     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-posang",  0,
         "define rotator position angle", NAN);
+    psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-obstype",  0,
+        "define exposure obstype", NULL);
     /*
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip",  0,
@@ -122 +124 @@
     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-posang",  0,
         "define rotator position angle", NAN);
+    psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-obstype",  0,
+        "define exposure obstype", NULL);
     
     // -rawimfile