Changeset 16248 for trunk/ippTools/src/chiptool.c

Timestamp:

Jan 25, 2008, 4:14:35 PM (18 years ago)

Author:

eugene

Message:

updating code to handle new fields (dtime entries for chip,cam,warp,diff,stack; making chip/cam metadata consistent

File:

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

trunk/ippTools/src/chiptool.c

@@ -309 +309 @@
 
     // optional
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false);
-    PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false);
-    PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false);
-    PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false);
-    PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false);
-    PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false);
-    PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false);
-    PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false);
-    PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false);
-    PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false);
-    PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false);
-    PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false);
+    PXOPT_LOOKUP_STR(uri, config->args,            "-uri", false, false);
+    PXOPT_LOOKUP_F32(bg, config->args,             "-bg", false, false);
+    PXOPT_LOOKUP_F32(bg_stdev, config->args,       "-bg_stdev", false, false);
+    PXOPT_LOOKUP_F32(bg_mean_stdev, config->args,  "-bg_mean_stdev", false, false);
+    PXOPT_LOOKUP_F32(bias, config->args,           "-bias", false, false);
+    PXOPT_LOOKUP_F32(bias_stdev, config->args,     "-bias_stdev", false, false);
+    PXOPT_LOOKUP_F32(fringe_0, config->args,       "-fringe_0", false, false);
+    PXOPT_LOOKUP_F32(fringe_1, config->args,       "-fringe_1", false, false);
+    PXOPT_LOOKUP_F32(fringe_2, config->args,       "-fringe_2", false, false);
+    PXOPT_LOOKUP_F32(sigma_ra, config->args,       "-sigma_ra", false, false);
+    PXOPT_LOOKUP_F32(sigma_dec, config->args,      "-sigma_dec", false, false);
+    PXOPT_LOOKUP_F32(ap_resid, config->args,       "-ap_resid", false, false);
     PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false);
-    PXOPT_LOOKUP_F32(fwhm, config->args, "-fwhm", false, false);
-    PXOPT_LOOKUP_F32(fwhm_range, config->args, "-fwhm_range", false, false);
+    PXOPT_LOOKUP_F32(zp_mean, config->args,        "-zp_mean", false, false);
+    PXOPT_LOOKUP_F32(zp_stdev, config->args,       "-zp_stdev", false, false);
+    PXOPT_LOOKUP_F32(fwhm_major, config->args,     "-fwhm_major", false, false);
+    PXOPT_LOOKUP_F32(fwhm_minor, config->args,     "-fwhm_minor", false, false);
+    PXOPT_LOOKUP_F32(dtime_detrend, config->args,  "-dtime_detrend", false, false);
+    PXOPT_LOOKUP_F32(dtime_photom,  config->args,  "-dtime_photom",  false, false);
+    PXOPT_LOOKUP_F32(dtime_astrom,  config->args,  "-dtime_astrom",  false, false);
     PXOPT_LOOKUP_F32(n_stars, config->args, "-n_stars", false, false);
     PXOPT_LOOKUP_F32(n_extended, config->args, "-n_extended", false, false);
@@ -339 +344 @@
 
     if (!chipProcessedImfileInsert(config->dbh,
-        (psS64)atoll(chip_id),
-        (psS64)atoll(exp_id),
-        class_id,
-        uri,
-        bg,
-        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,
-        path_base,
-        code
-    )) {
+                                   (psS64)atoll(chip_id),
+                                   (psS64)atoll(exp_id),
+                                   class_id,
+                                   uri,
+                                   bg,
+                                   bg_stdev,
+                                   bg_mean_stdev,
+                                   bias,
+                                   bias_stdev,
+                                   fringe_0,
+                                   fringe_1,
+                                   fringe_2,
+                                   sigma_ra,
+                                   sigma_dec,
+                                   ap_resid,
+                                   ap_resid_stdev,
+                                   zp_mean,
+                                   zp_stdev,
+                                   fwhm_major,
+                                   fwhm_minor,
+                                   dtime_detrend,
+                                   dtime_photom,
+                                   dtime_astrom,
+                                   n_stars,
+                                   n_extended,
+                                   n_cr,
+                                   n_astrom,
+                                   path_base,
+                                   code
+            )) {
         // rollback
         if (!psDBRollback(config->dbh)) {