Changeset 15359 for branches/eam_branch_20071023/psModules/src/objects/pmSourceIO.c

Timestamp:

Oct 23, 2007, 10:54:53 AM (19 years ago)

Author:

eugene

Message:

adding pieces for astrometry table I/O, extended source analysis

File:

• branches/eam_branch_20071023/psModules/src/objects/pmSourceIO.c (modified) (4 diffs)

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

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-05 22:46:34 $
+ *  @version $Revision: 1.52.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-23 20:54:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -224 +224 @@
 
     bool status;
-    char *exttype;
-    char *dataname;
-    char *headname;
     pmHDU *hdu;
     psMetadata *updates;
     psMetadata *outhead;
+
+    char *exttype  = NULL;
+    char *dataname = NULL;
+    char *xsrcname = NULL;
+    char *headname = NULL;
 
     // XXX if sources is NULL, skip the cell or write out empty tables?
@@ -312 +314 @@
             }
             dataname = pmFPAfileNameFromRule (rule, file, view);
+
+            if (XSRC_OUTPUT) {
+              // EXTNAME for extended source data table
+              rule = psMetadataLookupStr(&status, menu, "CMF.XSRC");
+              if (!rule) {
+                psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.XSRC in EXTNAME.RULES in camera.config");
+                return false;
+              }
+              xsrcname = pmFPAfileNameFromRule (rule, file, view);
+            }
         }
 
@@ -375 +387 @@
             }
             if (!strcmp (exttype, "PS1_DEV_1")) {
-                status = pmSourcesWrite_PS1_DEV_1 (file->fits, sources, file->header, outhead, dataname);
-            }
-
+                status = pmSourcesWrite_PS1_DEV_1 (file->fits, sources, file->header, outhead, dataname, xsrcname);
+            }
             if (!status) {
                 psError(PS_ERR_IO, false, "writing CMF data to %s with format %s\n", file->filename, exttype);