Changeset 9250

Timestamp:

Oct 4, 2006, 1:32:49 PM (20 years ago)

Author:

jhoblitt

Message:

rename obstype fields -> object

Location:

trunk/ippTools

Files:

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

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.45]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.46]) 
 
 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 -obstype dog || 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 -object 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 -obstype dog $* || 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 -object 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 -obstype dog || 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 -object 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 -obstype dog $* || 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 -object dog $* || exit 1

trunk/ippTools/src/regtool.c

@@ -814 +814 @@
         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");
+    // optional
+    psString object = psMetadataLookupStr(&status, config->args, "-object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -object");
         return false;
     }
@@ -842 +839 @@
         ccd_temp,
         posang,
-        obstype
+        object
     );
 }
@@ -969 +966 @@
         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");
+    // optional
+    psString object = psMetadataLookupStr(&status, config->args, "-object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -object");
         return false;
     }
@@ -997 +991 @@
         ccd_temp,
         posang,
-        obstype
+        object
     );
 }

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(updateexpArgs, PS_LIST_TAIL, "-object",  0,
+        "define exposure object", NULL);
     /*
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip",  0,
@@ -124 +124 @@
     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-posang",  0,
         "define rotator position angle", NAN);
-    psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-obstype",  0,
-        "define exposure obstype", NULL);
+    psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-object",  0,
+        "define exposure object", NULL);
     
     // -rawimfile