Changeset 17326 for branches/eam_branch_20080324/psModules/src/objects/pmSourceIO.c

Timestamp:

Apr 4, 2008, 3:48:21 PM (18 years ago)

Author:

eugene

Message:

check same recipe element for creating XSRC/XFIT as for performing analysis

File:

• branches/eam_branch_20080324/psModules/src/objects/pmSourceIO.c (modified) (5 diffs)

branches/eam_branch_20080324/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-03-17 22:04:27 $
+ *  @version $Revision: 1.55.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-05 01:48:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -327 +327 @@
 
         // if this is not TRUE, the output files only contain the psf measurements.
-        bool XSRC_OUTPUT = psMetadataLookupBool(&status, recipe, "SAVE.XSRC");
-        bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "SAVE.XFIT");
+        bool XSRC_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_ANALYSIS");
+        bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS");
 
         // define the EXTNAME values for the different data segments:
@@ -445 +445 @@
             if (xsrcname) {
               if (!strcmp (exttype, "PS1_DEV_1")) {
-                status = pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname);
+                status = pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname, recipe);
               }
             }
@@ -457 +457 @@
                 psFree (headname);
                 psFree (dataname);
+                psFree (xsrcname);
+                psFree (xfitname);
                 psFree (outhead);
                 return false;
@@ -466 +468 @@
         psFree (headname);
         psFree (dataname);
+        psFree (xsrcname);
+        psFree (xfitname);
         psFree (outhead);
         break;