Changeset 27838 for branches/tap_branches/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceIO_CMF_PS1_V1.c (modified) (10 diffs)

branches/tap_branches/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

@@ -69 +69 @@
     float magOffset = NAN;
     float exptime   = psMetadataLookupF32 (&status1, fpa->concepts, "FPA.EXPOSURE");
-    float zeropt    = psMetadataLookupF32 (&status2, imageHeader, "ZPT_OBS");
-    float zeroptErr = psMetadataLookupF32 (&status2, imageHeader, "ZPT_ERR");
+    float zeropt    = psMetadataLookupF32(&status2, fpa->concepts, "FPA.ZP");
+    if (!isfinite(zeropt)) {
+        zeropt    = psMetadataLookupF32 (&status2, imageHeader, "ZPT_OBS");
+    }
     if (status1 && status2 && (exptime > 0.0)) {
         magOffset = zeropt + 2.5*log10(exptime);
     }
+    float zeroptErr = psMetadataLookupF32 (&status2, imageHeader, "ZPT_ERR");
 
     // if the sequence is defined, write these in seq order; otherwise
@@ -213 +216 @@
 
     if (table->n == 0) {
-        psFitsWriteBlank(fits, header, extname);
+        if (!psFitsWriteBlank(fits, header, extname)) {
+            psError(psErrorCodeLast(), false, "Unable to write empty sources file.");
+            psFree(table);
+            psFree(header);
+            return false;
+        }
         psFree(table);
         psFree(header);
@@ -221 +229 @@
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
     if (!psFitsWriteTable(fits, header, table, extname)) {
-        psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
+        psError(psErrorCodeLast(), false, "writing ext data %s\n", extname);
         psFree(table);
         psFree(header);
@@ -331 +339 @@
 
 // XXX this layout is still the same as PS1_DEV_1
-bool pmSourcesWrite_CMF_PS1_V1_XSRC (psFits *fits, psArray *sources, char *extname, psMetadata *recipe)
+bool pmSourcesWrite_CMF_PS1_V1_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe)
 {
 
@@ -477 +485 @@
         }
 
-# endif 
+# endif
         psArrayAdd (table, 100, row);
         psFree (row);
@@ -483 +491 @@
 
     if (table->n == 0) {
-        psFitsWriteBlank (fits, outhead, extname);
+        if (!psFitsWriteBlank (fits, outhead, extname)) {
+            psError(psErrorCodeLast(), false, "Unable to write empty sources.");
+            psFree(outhead);
+            psFree(table);
+            return false;
+        }
         psFree (outhead);
         psFree (table);
@@ -491 +504 @@
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
     if (!psFitsWriteTable (fits, outhead, table, extname)) {
-        psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
+        psError(psErrorCodeLast(), false, "writing ext data %s\n", extname);
         psFree (outhead);
         psFree(table);
@@ -503 +516 @@
 
 // XXX this layout is still the same as PS1_DEV_1
-bool pmSourcesWrite_CMF_PS1_V1_XFIT (psFits *fits, psArray *sources, char *extname)
+bool pmSourcesWrite_CMF_PS1_V1_XFIT (psFits *fits, pmReadout *readout, psArray *sources, char *extname)
 {
 
@@ -609 +622 @@
 
     if (table->n == 0) {
-        psFitsWriteBlank (fits, outhead, extname);
+        if (!psFitsWriteBlank (fits, outhead, extname)) {
+            psError(psErrorCodeLast(), false, "Unable to write empty sources.");
+            psFree(outhead);
+            psFree(table);
+            return false;
+        }
         psFree (outhead);
         psFree (table);
@@ -617 +635 @@
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
     if (!psFitsWriteTable (fits, outhead, table, extname)) {
-        psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
+        psError(psErrorCodeLast(), false, "writing ext data %s\n", extname);
         psFree (outhead);
         psFree(table);