Changeset 31435 for trunk/ppSub/src/ppSubMakePSF.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/ppSubMakePSF.c (modified) (1 diff)

trunk/ppSub/src/ppSubMakePSF.c

@@ -37 +37 @@
 
     bool reverse = psMetadataLookupBool(NULL, config->arguments, "REVERSE"); // Reverse sense of subtraction?
-
+    
     bool mdok = false;                  // Status of MD lookup
     pmReadout *minuend = NULL;          // Image that will be positive following subtraction
     pmFPAfile *minuendFile = NULL;      // File for minuend image
     pmFPAview *view = ppSubViewReadout(); // View to readout
-    if (reverse) {
+
+    psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSUB_RECIPE); // Recipe for ppSub
+    bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
+
+    if (!noConvolve) {
+      printf("Using Convolved images because NOCONVOLVE is FALSE\n");
+      if (reverse) {
         minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
-    } else {
+        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
+      } else {
         minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
+        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
+      }
+    }
+    else {
+      psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
+      if (reverse) {
+        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
+        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF");
+      } else {
+        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
+        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT");
+      }
     }