Changeset 34772 for branches/czw_branch/20120906/ippTools/src/warptool.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/ippTools/src

Files:

• . (modified) (1 prop)
• warptool.c (modified) (6 diffs)

branches/czw_branch/20120906/ippTools/src/warptool.c

@@ -1101 +1101 @@
     PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
 
+    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s pswarp %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_pswarp,ver_streaks);
@@ -1159 +1161 @@
                            maskfrac_dynamic,
                            maskfrac_magic,
-                           maskfrac_advisory
+                           maskfrac_advisory,
+                           background_model
         )) {
         if (!psDBRollback(config->dbh)) {
@@ -1392 +1395 @@
     PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "LIKE");
     PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
+    PXOPT_COPY_S16(config->args, where, "-background_model", "warpSkyfile.background_model", "==");
     pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
     pxAddLabelSearchArgs (config, where, "-data_group",   "warpRun.data_group", "LIKE");
@@ -2053 +2057 @@
         PXOPT_LOOKUP_S64(magicked, config->args, "-set_magicked", false, false);
         PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
+
         if (magicked) {
             psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.magicked = %" PRId64, magicked);
@@ -2059 +2064 @@
         if (quality) {
           psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.quality = %"PRId16, quality);
+        }
+        PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false);
+        if (background_model) {
+          psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.background_model = %"PRId16, background_model);
         }
     } else if (!strcmp(data_state, "cleaned") || !strcmp(data_state, "purged")) {
@@ -2119 +2128 @@
     // warp_id, skycell_id, fault are required
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
-
-    if (!state) {
+    PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false);
+    if (background_model) {
+      // CZW 2012-12-06: I'm unclear why we don't use this form for all updates?
+      psMetadata *where = psMetadataAlloc();
+      psMetadata *values = psMetadataAlloc();
+      PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
+      PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
+      PXOPT_COPY_S16(config->args, values, "-set_background_model", "background_model", "==");
+      long rows = psDBUpdateRows(config->dbh,"warpSkyfile", where, values);
+      psFree(values);
+      psFree(where);
+      if (!rows) {
+        // This maybe should rollback and error if rows != 1
+        psError(PS_ERR_UNKNOWN, true, "no rows changed");
+        return false;
+      }
+    }
+    else if (!state) {
       psMetadata *where = psMetadataAlloc();
       PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");