Changeset 36362

Timestamp:

Dec 10, 2013, 11:12:58 AM (13 years ago)

Author:

bills

Message:

Fix recipe values consulted when deciding whether to attempt to read an XSRC extension.

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c

@@ -478 +478 @@
         }
 
-        // if this is not TRUE, the output files only contain the psf measurements.
+        // if none of these are TRUE, the output files only contain the psf measurements.
         bool doPetrosian = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
         bool doAnnuli    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
@@ -1029 +1029 @@
         }
 
-        // if this is not TRUE, the output files only contain the psf measurements.
-        bool XSRC_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_ANALYSIS");
+        // if none of these are TRUE, we only read the psf measurements
+        // XXX: shouldn't we look for these extensions and read the regardless of the recipe values?
+        bool doPetrosian = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
+        bool doAnnuli    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
+        bool XSRC_OUTPUT = doPetrosian || doAnnuli;
         bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS");
         bool XRAD_OUTPUT = psMetadataLookupBool(&status, recipe, "RADIAL_APERTURES");