Changeset 28534 for branches/pap/magic/remove/src/streaksremove.c

Timestamp:

Jun 28, 2010, 8:11:04 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in preparation for merging branch to trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• magic/remove/src/streaksremove.c (modified) (4 diffs)

branches/pap/magic/remove/src/streaksremove.c

@@ -577 +577 @@
 }
 
-static void 
+static void
 setStreakBits(psImage *maskImage, psU32 maskStreak)
 {
@@ -644 +644 @@
             if (exciseAll) {
                 strkGetMaskValues(sf);
-                
+
                 // add the STREAK bit to the mask image pixels
                 setStreakBits(sf->inMask->image, sf->maskStreak);
@@ -941 +941 @@
         psArray *inTable = psFitsReadTable(in->fits);
         if (!inTable) {
-            psErrorStackPrint(stderr, "failed to read tablle in %s", in->resolved_name);
-            streaksExit("", PS_EXIT_DATA_ERROR);
-        }
-        if (!inTable->n) {
-            psErrorStackPrint(stderr, "table in %s is empty", in->resolved_name);
+            psErrorStackPrint(stderr, "failed to read table in %s", in->resolved_name);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
@@ -983 +979 @@
                 streaksExit("", PS_EXIT_DATA_ERROR);
             }
+        } else if (psArrayLength(inTable) == 0) {
+            printf("No input sources\n");
+            // We'd like to write a blank table, but this is as good as it gets without more work to parse the
+            // header and create dummy columns.
+            if (!psFitsWriteBlank(out->fits, header, extname)) {
+                psErrorStackPrint(stderr, "failed to write empty header to %s", out->resolved_name);
+                streaksExit("", PS_EXIT_DATA_ERROR);
+            }
         } else {
             printf("Censored ALL %d sources\n", numCensored);