Changeset 35537 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c

Timestamp:

May 8, 2013, 5:07:02 PM (13 years ago)

Author:

eugene

Message:

make the warp mode (science / background) an argument to TransformReadout, not a test of a metadata in argument

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c (modified) (3 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c

@@ -16 +16 @@
  * NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
  */
-bool pswarpTransformReadout(pmReadout *output, pmReadout *input, pmConfig *config)
+bool pswarpTransformReadout(pmReadout *output, pmReadout *input, pmConfig *config, bool backgroundWarp)
 {
     // XXX this implementation currently ignores the use of the region
@@ -47 +47 @@
     }
     psAssert(mdok, "MASK.INPUT was not defined");
-
-    bool backgroundWarp = psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING");
 
     if (!input->covariance) {
@@ -208 +206 @@
     psFree(interp);
 
-    if (goodPixels > 0 && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
-      if (!psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
-        if (!pswarpTransformSources(output, input, config)) {
-          psError(psErrorCodeLast(), false, "Unable to interpolate image.");
-          return false;
+    if (goodPixels > 0 && !backgroundWarp && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
+        if (!pswarpTransformSources(output, input, config)) {
+            psError(psErrorCodeLast(), false, "Unable to transform sources.");
+            return false;
         }
-      }
     }