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

Timestamp:

Mar 15, 2007, 10:45:27 AM (19 years ago)

Author:

magnier

Message:

fixing support for PS1_DEV_0

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-11 18:56:38 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-15 20:45:27 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -334 +334 @@
           return false;
         }
-        exttype = psMetadataLookupMetadata(&status, recipe, "OUTPUT.FORMAT");
-        if (!status) {
-          psError(PS_ERR_UNKNOWN, true, "missing OUTPUT.FORMAT in PSPHOT recipe");
-          return false;
-        }
+        exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
+        if (!exttype) {
+            exttype = psStringCopy ("SMPDATA");
+        } 
 
         psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTHEAD", PS_META_REPLACE, "name of image extension w/", headname);
@@ -345 +344 @@
 
         // XXX these are case-sensitive since the EXTYPE is case-sensitive
-
         status = false;
         if (!strcmp (exttype, "SMPDATA")) {
@@ -517 +515 @@
         }
 
-        XXX need to test for EXTNAME vs SMPDATA, PS1_DEV_0, etc
-
         // we need to find the corresponding table EXTNAME.
         // first check the header
@@ -532 +528 @@
             psAbort("cannot find data extension %s in %s", dataname, file->filename);
         }
-        sources = pmSourcesReadCMF (file->fits, hdu->header);
+
+        psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
+        if (!tableHeader) psAbort("cannot read table header");
+
+        char *exttype = psMetadataLookupStr (NULL, tableHeader, "EXTTYPE");
+        if (!exttype) psAbort("cannot read table type");
+
+        // XXX these are case-sensitive since the EXTYPE is case-sensitive
+        if (!strcmp (exttype, "SMPDATA")) {
+            sources = pmSourcesRead_SMPDATA (file->fits, hdu->header);
+        }
+        if (!strcmp (exttype, "PS1_DEV_0")) {
+            sources = pmSourcesRead_PS1_DEV_0 (file->fits, hdu->header);
+        }
+
         psFree (dataname);
         break;