Changeset 12481 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

Mar 18, 2007, 12:03:21 PM (19 years ago)

Author:

magnier

Message:

added pmConceptsReadCell to pmSourceReadCell; modified pmSourceWrite_ APIs for CMF formats

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (6 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-16 01:48:55 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-18 22:03:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmConcepts.h"
 
 #include "pmPeaks.h"
@@ -333 +334 @@
         }
 
-        // create a header to hold the output data
-        outhead = psMetadataAlloc ();
-
-        // save psphot and psastro metadata in the image and table headers
-        // XXX this is a bit silly: we are duplicating these because I'm not sure which
-        // I need to keep for multi-readout images...
-        updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
-        if (updates) {
-            psMetadataCopy (outhead, updates);
-        }
-        updates = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.HEADER");
-        if (updates) {
-            psMetadataCopy (outhead, updates);
-        }
-
+        // create a header to hold the output data
+        outhead = psMetadataAlloc ();
+
+        // determine the output table format 
         psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
         if (!status) {
@@ -358 +348 @@
         } 
 
+        // write the links to the image header
         psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTHEAD", PS_META_REPLACE, "name of image extension w/", headname);
         psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", exttype);
@@ -365 +356 @@
         status = false;
         if (!strcmp (exttype, "SMPDATA")) {
-            status = pmSourcesWrite_SMPDATA (file->fits, sources, outhead, dataname);
+            status = pmSourcesWrite_SMPDATA (file->fits, sources, file->header, outhead, dataname);
         }
         if (!strcmp (exttype, "PS1_DEV_0")) {
-            status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, outhead, dataname);
+            status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, file->header, outhead, dataname);
         }
 
@@ -466 +457 @@
         pmReadout *readout = cell->readouts->data[i];
         pmReadoutReadObjects (readout, view, file, config);
+
+        // load in the concept information for this cell
+        if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+            //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
+            //return false;
+            psWarning("Difficulty reading concepts for cell; attempting to proceed.");
+        }
+
         cell->data_exists = true;
     }