Changeset 34747 for branches/eam_branches/ipp-20120905/ippTools/src/warptool.c

Timestamp:

Nov 30, 2012, 9:57:42 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/warptool.c (modified) (3 diffs)

branches/eam_branches/ipp-20120905/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");