Changeset 31441 for branches/eam_branches/ipp-20110404/ppSub/src/ppSubThreshold.c

Timestamp:

May 5, 2011, 10:08:44 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ppSub/src/ppSubThreshold.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/ppSub/src/ppSubThreshold.c

@@ -95 +95 @@
 
     // Input images
-    pmReadout *in = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); // Input image
+    bool noConvolve = psMetadataLookupBool(NULL, recipe, "NOCONVOLVE");
+
+    pmReadout *in;
+    if (noConvolve) {
+      in = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT"); // Input image
+    }
+    else {
+      in = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); // Input image
+    }
     if (!in) {
         psError(PPSUB_ERR_UNKNOWN, false, "Unable to find readout.");
@@ -102 +110 @@
     }
 
-    pmReadout *ref = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); // Reference image
+    pmReadout *ref;
+    if (noConvolve) {
+      ref = pmFPAfileThisReadout(config->files, view, "PPSUB.REF"); // Reference image
+    }
+    else {
+      ref = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); // Reference image
+    }
     if (!ref) {
         psError(PPSUB_ERR_UNKNOWN, false, "Unable to find readout.");