Changeset 13891

Timestamp:

Jun 19, 2007, 4:08:18 PM (19 years ago)

Author:

Paul Price

Message:

"inst" on the chiptool command-line is "camera" in the database.

File:

• trunk/ippTools/src/chiptool.c (modified) (6 diffs)

trunk/ippTools/src/chiptool.c

@@ -92 +92 @@
 }
 
-#define ADDPARAMSTR(from, to, name) \
+#define ADDRENAMEPARAMSTR(from, to, oldname, newname) \
 { \
     bool status = false; \
-    psString str = psMetadataLookupStr(&status, from, "-" name); \
+    psString str = psMetadataLookupStr(&status, from, "-" oldname); \
     if (!status) { \
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" name); \
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" oldname); \
         return false; \
     } \
     if (str) { \
-        if (!psMetadataAddStr(to, PS_LIST_TAIL, name, 0, "==", str)) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " name); \
+        if (!psMetadataAddStr(to, PS_LIST_TAIL, newname, 0, "==", str)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \
             psFree(to); \
             return false; \
@@ -109 +109 @@
 }
 
+#define ADDPARAMSTR(from, to, name) ADDRENAMEPARAMSTR(from, to, name, name)
 
 #define ADDPARAMF(from, to, type, name) \
@@ -134 +135 @@
     ADDPARAMSTR(config->args, where, "exp_tag");
     ADDPARAMSTR(config->args, where, "exp_id");
-    ADDPARAMSTR(config->args, where, "inst");
+    ADDRENAMEPARAMSTR(config->args, where, "inst", "camera");
     ADDPARAMSTR(config->args, where, "telescope");
     ADDPARAMSTR(config->args, where, "dateobs");
@@ -798 +799 @@
         // camQueueChipID() can only be run after the chipProcessedExp entry
         // has been inserted.
-        // queue the chip_id in the camPendingExp table 
+        // queue the chip_id in the camPendingExp table
         if (!camQueueChipID(config,
                     processedExp->chip_id,
@@ -967 +968 @@
         bg_stdev,
         bg_mean_stdev,
-        bias,
-        bias_stdev,
-        fringe_0,
-        fringe_1,
-        fringe_2,
-        sigma_ra,
-        sigma_dec,
-        ap_resid,
-        ap_resid_stdev,
-        fwhm,
-        fwhm_range,
-        n_stars,
-        n_extended,
-        n_cr,
-        n_astrom,
+        bias,
+        bias_stdev,
+        fringe_0,
+        fringe_1,
+        fringe_2,
+        sigma_ra,
+        sigma_dec,
+        ap_resid,
+        ap_resid_stdev,
+        fwhm,
+        fwhm_range,
+        n_stars,
+        n_extended,
+        n_cr,
+        n_astrom,
         path_base,
         code
-        );
+        );
 }
 
@@ -991 +992 @@
 {
     PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
- 
+
     return chipProcessedExpRowAlloc(
         pendingExp->chip_id,