Changeset 36829 for branches/eam_branches/ipp-20140423/psModules/src/objects/pmSourceIO.c

Timestamp:

Jun 7, 2014, 5:40:37 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

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

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

@@ -1202 +1202 @@
         break;
 
-      case PM_FPA_FILE_CFF:
+      case PM_FPA_FILE_CFF: {
+        // determine the output table format
+        psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
+            return false;
+        }
         // read in header, if not yet loaded
         hdu = pmFPAviewThisHDU (view, file->fpa);
@@ -1244 +1250 @@
         }
 
-        sources = pmSourcesRead_CFF(file->fits, hdu->header);
+        sources = pmSourcesRead_CFF(file->fits, hdu->header, recipe);
 
         psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
@@ -1250 +1256 @@
         psFree (dataname);
         psFree (tableHeader);
+        }
         break;