Changeset 31435 for trunk/ppSub/src/ppSubReadoutSubtract.c

Timestamp:

May 4, 2011, 3:59:42 PM (15 years ago)

Author:

watersc1

Message:

LAP code, quick stacking code, and unconvolved diff code.

File:

• trunk/ppSub/src/ppSubReadoutSubtract.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadoutSubtract.c

@@ -31 +31 @@
 
     bool reverse = psMetadataLookupBool(&mdok, config->arguments, "REVERSE"); // Reverse sense of subtraction?
+    bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
     bool addPair = psMetadataLookupBool(&mdok, recipe, "ADD.NOT.SUBTRACT"); // add instead of subtracting
 
@@ -38 +39 @@
     pmReadout *minuend = NULL;          // Positive image
     pmReadout *subtrahend = NULL;       // Negative image
-    if (reverse) {
+    if (!noConvolve) {
+      printf("Using Convolved images because NOCONVOLVE is FALSE\n");
+      if (reverse) {
         minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
         subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
-    } else {
+      } else {
         minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
         subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
+      }
+    }
+    else {
+      psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
+      if (reverse) {
+        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
+        subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
+      } else {
+        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
+        subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
+      }
     }