Changeset 32698

Timestamp:

Nov 17, 2011, 2:23:38 PM (15 years ago)

Author:

watersc1

Message:

Merge from trunk to fix noconv diffs

Location:

tags/ipp-20111110/ppSub/src

Files:

• . (modified) (1 prop)
• ppSubReadoutInverse.c (modified) (2 diffs)

tags/ipp-20111110/ppSub/src/ppSubReadoutInverse.c

@@ -11 +11 @@
 {
     psAssert(config, "Require configuration");
-
+    // Check configuration for convolve option
+    psMetadata *recipe = psMetadataLookupPtr(NULL, config->recipes, PPSUB_RECIPE);
+    bool noConvolve = psMetadataLookupBool(NULL, recipe, "NOCONVOLVE"); // Do not use convolved images.
+    
     pmFPAview *view = ppSubViewReadout(); // View to readout
     pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
@@ -25 +28 @@
 
     // Get concepts from reference
-    pmFPAfile *refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF.CONV"); // File with concepts
+    pmFPAfile *refFile;
+    if (noConvolve) {
+      refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF"); // File with concepts
+    }
+    else {
+      refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF.CONV"); // File with concepts
+    }
     pmFPA *invFPA = invRO->parent->parent->parent; // Inverse FPA
     pmConceptsCopyFPA(invFPA, refFile->fpa, true, true);