Changeset 25084

Timestamp:

Aug 14, 2009, 4:15:36 PM (17 years ago)

Author:

Paul Price

Message:

Need to move to extension before starting to read it.

File:

• trunk/magic/remove/src/streaksremove.c (modified) (5 diffs)

trunk/magic/remove/src/streaksremove.c

@@ -824 +824 @@
     // Extension with PSF fits, should be "something.psf"
     {
+        if (!psFitsMoveExtNum(in->fits, 1, true)) {
+            psErrorStackPrint(stderr, "failed to read header from %s", in->resolved_name);
+            streaksExit("", PS_EXIT_DATA_ERROR);
+        }
+
         psMetadata *header = psFitsReadHeader(NULL, in->fits);
         if (!header) {
-            psError(PS_ERR_IO, false, "failed to read header from %s", in->resolved_name);
+            psErrorStackPrint(stderr, "failed to read header from %s", in->resolved_name);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
@@ -837 +842 @@
         psArray *inTable = psFitsReadTable(in->fits);
         if (!inTable->n) {
-            psError(PS_ERR_IO, false, "table in %s is empty", in->resolved_name);
+            psErrorStackPrint(stderr, "table in %s is empty", in->resolved_name);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
@@ -867 +872 @@
             printf("Censored %d sources\n", numCensored);
             if (! psFitsWriteTable(out->fits, header, outTable, extname)) {
-                psError(PS_ERR_IO, false, "failed to write table to %s", out->resolved_name);
+                psErrorStackPrint(stderr, "failed to write table to %s", out->resolved_name);
                 streaksExit("", PS_EXIT_DATA_ERROR);
             }
@@ -873 +878 @@
             printf("Censored ALL %d sources\n", numCensored);
             if (! psFitsWriteTableEmpty(out->fits, header, inTable->data[0], extname)) {
-                psError(PS_ERR_IO, false, "failed to write empty table to %s", out->resolved_name);
+                psErrorStackPrint(stderr, "failed to write empty table to %s", out->resolved_name);
                 streaksExit("", PS_EXIT_DATA_ERROR);
             }
@@ -885 +890 @@
 
     if (!psFitsClose(out->fits)) {
-        psError(PS_ERR_IO, false, "failed to close table %s", out->resolved_name);
+        psErrorStackPrint(stderr, "failed to close table %s", out->resolved_name);
         streaksExit("", PS_EXIT_DATA_ERROR);
     }