Changeset 13136

Timestamp:

May 2, 2007, 2:12:03 PM (19 years ago)

Author:

magnier

Message:

added psphotSetDophotType; changed pmSourceDophotType to pmSourceGetDophotType; use original hdu for updates (not a copy)

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-26 01:20:29 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-03 00:12:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
 
 // translations between psphot object types and dophot object types
-int pmSourceDophotType (pmSource *source)
+int pmSourceGetDophotType (pmSource *source)
 {
     switch (source->type) {
@@ -65 +65 @@
     }
     return (0);
+}
+
+// translations between psphot object types and dophot object types
+bool pmSourceSetDophotType (pmSource *source, int type)
+{
+    if (type == 4) {
+        source->mode |= PM_SOURCE_MODE_FAIL;
+    }
+    if (type == 7) {
+        source->mode |= PM_SOURCE_MODE_POOR;
+    }
+    if (type == 10) {
+        source->mode |= PM_SOURCE_MODE_SATSTAR;
+    }
+
+    switch (type) {
+      case 1:
+      case 4:
+      case 7:
+      case 10:
+        source->type = PM_SOURCE_TYPE_STAR; 
+        return true;
+      case 2:
+        source->type = PM_SOURCE_TYPE_EXTENDED; 
+        return true;
+      case 8:
+        source->type = PM_SOURCE_TYPE_DEFECT; 
+        return true;
+      default:
+        return false;
+    }
+    return false;
 }
 
@@ -323 +355 @@
         // this header block is new, write it to disk
         if (hdu->header != file->header) {
-            outhead = psMetadataCopy (NULL, hdu->header);
+            // XXX I was building a new copy, why?  supplement the output header
+            // outhead = psMetadataCopy (NULL, hdu->header);
 
             // add EXTNAME, EXTHEAD, EXTTYPE to header
             // psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "extension name", headname);
-            psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTDATA", PS_META_REPLACE, "name of table extension", dataname);
-            psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", "IMAGE");
+            psMetadataAddStr (hdu->header, PS_LIST_TAIL, "EXTDATA", PS_META_REPLACE, "name of table extension", dataname);
+            psMetadataAddStr (hdu->header, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", "IMAGE");
             if (!file->phu) {
                 // this hdu->header acts as the PHU: set EXTEND to be true
-                psMetadataAddBool (outhead, PS_LIST_TAIL, "EXTEND", PS_META_REPLACE, "this file has extensions", true);
+                psMetadataAddBool (hdu->header, PS_LIST_TAIL, "EXTEND", PS_META_REPLACE, "this file has extensions", true);
             }
 
@@ -337 +370 @@
             updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
             if (updates) {
-                psMetadataCopy (outhead, updates);
+                psMetadataCopy (hdu->header, updates);
             }
             updates = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.HEADER");
             if (updates) {
-                psMetadataCopy (outhead, updates);
+                psMetadataCopy (hdu->header, updates);
             }
 
-            psFitsWriteBlank (file->fits, outhead, headname);
+            psFitsWriteBlank (file->fits, hdu->header, headname);
             psTrace ("pmFPAfile", 5, "wrote ext head %s (type: %d)\n", file->filename, file->type);
             file->header = hdu->header;
-            psFree (outhead);
         }