Changeset 12481

Timestamp:

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

Author:

magnier

Message:

added pmConceptsReadCell to pmSourceReadCell; modified pmSourceWrite_ APIs for CMF formats

Location:

trunk/psModules/src/objects

Files:

• pmSourceIO.c (modified) (6 diffs)
• pmSourceIO.h (modified) (2 diffs)
• pmSourceIO_PS1_DEV_0.c (modified) (4 diffs)
• pmSourceIO_SMPDATA.c (modified) (5 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;
     }

trunk/psModules/src/objects/pmSourceIO.h

@@ -4 +4 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-15 20:44:55 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-18 22:03:21 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  *
@@ -23 +23 @@
 bool pmSourcesWriteCMP (psArray *sources, char *filename, psMetadata *header);
 
-bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, psMetadata *header, char *extname);
-bool pmSourcesWrite_PS1_DEV_0 (psFits *fits, psArray *sources, psMetadata *header, char *extname);
+bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
+bool pmSourcesWrite_PS1_DEV_0 (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
 
 psArray *pmSourcesReadCMP (char *filename, psMetadata *header);

trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-15 20:44:25 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-18 22:03:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 // XXX how do I generate the source tables which I need to send to PSPS?
 
-bool pmSourcesWrite_PS1_DEV_0 (psFits *fits, psArray *sources, psMetadata *header, char *extname)
+bool pmSourcesWrite_PS1_DEV_0 (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname)
 {
 
@@ -107 +107 @@
 
     if (table->n == 0) {
-        psFitsWriteBlank (fits, header, extname);
+        psFitsWriteBlank (fits, tableHeader, extname);
         psFree (table);
         return true;
@@ -113 +113 @@
 
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
-    if (!psFitsWriteTable (fits, header, table, extname)) {
+    if (!psFitsWriteTable (fits, tableHeader, table, extname)) {
         psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
         psFree(table);

trunk/psModules/src/objects/pmSourceIO_SMPDATA.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-11 18:56:38 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-18 22:03:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 // this format consists of a header derived from the image header
 // followed by a zero-size matrix, followed by the table data
-bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, psMetadata *header, char *extname)
+bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname)
 {
 
@@ -48 +48 @@
 
     // find config information for output header
-    float ZERO_POINT = psMetadataLookupF32 (&status, header, "ZERO_PT");
+    float ZERO_POINT = psMetadataLookupF32 (&status, imageHeader, "ZERO_PT");
 
     table = psArrayAllocEmpty (sources->n);
@@ -89 +89 @@
 
     if (table->n == 0) {
-        psFitsWriteBlank (fits, header, extname);
+        psFitsWriteBlank (fits, tableHeader, extname);
         psFree (table);
         return true;
@@ -95 +95 @@
 
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
-    if (!psFitsWriteTable (fits, header, table, extname)) {
+    if (!psFitsWriteTable (fits, tableHeader, table, extname)) {
         psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
         psFree(table);