Changeset 25051 for branches/czw_branch/cleanup/magic/remove/src

Timestamp:

Aug 11, 2009, 3:54:00 PM (17 years ago)

Author:

watersc1

Message:

Bringing branch up-to-date at revision 25049

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• magic/remove/src/Line.c (modified) (2 diffs)
• magic/remove/src/streaksextern.c (modified) (1 diff)
• magic/remove/src/streaksextern.h (modified) (2 diffs)
• magic/remove/src/streaksremove.c (modified) (6 diffs)

branches/czw_branch/cleanup/magic/remove/src/Line.c

@@ -444 +444 @@
                 if (y >= 0 && y < numRows)
                 {
-                    pixel = psAlloc (sizeof(PixelPos));
-                    pixel->x = (unsigned int) x;
-                    pixel->y = (unsigned int) y;
-                    psArrayAdd (pixels, 1024, pixel);
-                    psFree (pixel);
+                    psImageSet(pixels, x, y, 1);
                 }
             }
@@ -494 +490 @@
                 if (x >=0 && x < numCols)
                 {
-                    pixel = psAlloc (sizeof(PixelPos));
-                    pixel->x = (unsigned int) x;
-                    pixel->y = (unsigned int) y;
-                    psArrayAdd (pixels, 1024, pixel);
-                    psFree (pixel);
+                    psImageSet(pixels, x, y, 1);
                 }
             }

branches/czw_branch/cleanup/magic/remove/src/streaksextern.c

@@ -34 +34 @@
     int i;
     Line line;
-    StreakPixels *pixels = psArrayAllocEmpty (1024);
+    StreakPixels *pixels = psImageAlloc(numCols, numRows, PS_TYPE_U8);
+    psImageInit(pixels, 0);
     int streaksOnComponent = 0;
 

branches/czw_branch/cleanup/magic/remove/src/streaksextern.h

@@ -4 +4 @@
 /** psLib includes */
 
-#include "psArray.h"
+#include "psImage.h"
 
 /** streakremove includes */
@@ -36 +36 @@
 /** For now, use psArray to define a list of PixelPos pointers */
 
-typedef psArray StreakPixels;
+typedef psImage StreakPixels;
 
 /** Create a list of pixel positions from a Streaks pointer list

branches/czw_branch/cleanup/magic/remove/src/streaksremove.c

@@ -13 +13 @@
 static bool readAndCopyToOutput(streakFiles *sf, bool exciseAll);
 static void exciseNonWarpedPixels(streakFiles *sfiles, double newMaskValue);
-static bool warpedPixel(streakFiles *sfiles, PixelPos *cellCoord);
+static bool warpedPixel(streakFiles *sfiles, int x, int y);
 static void excisePixel(streakFiles *sfiles, unsigned int x, unsigned int y, bool streak, double newMaskValue);
 static void writeImages(streakFiles *sf, bool exciseImageCube);
@@ -146 +146 @@
                 }
 
-                totalStreakPixels +=  psArrayLength(pixels);
 
                 psTimerStart("REMOVE_STREAKS");
 
-                // for each pixel covered by the streak
-                for (int i = 0; i < psArrayLength (pixels); ++i) {
-                    PixelPos *pixelPos = psArrayGet (pixels, i);
-
-                    // if this pixel was not part of the warp, skip because it has already been
-                    // excised (unless we weren't asked to check)
-                    if (!checkNonWarpedPixels || warpedPixel(sfiles, pixelPos)) {
-
-                        excisePixel(sfiles, pixelPos->x, pixelPos->y, true, maskStreak);
-
-                    } else {
-                        // This pixel was not included in any warp and has thus already excised
-                        // by exciseNonWarpedPixels
+                for (int y=0 ; y < sfiles->inImage->numRows; y++) {
+                    for (int x = 0; x < sfiles->inImage->numCols; x++) {
+                        if (psImageGet(pixels, x, y)) {
+                            ++totalStreakPixels;
+                            if (!checkNonWarpedPixels || warpedPixel(sfiles, x, y)) {
+
+                                excisePixel(sfiles, x, y, true, maskStreak);
+
+                            } else {
+                                // This pixel was not included in any warp and has thus already excised
+                                // by exciseNonWarpedPixels
+                            }
+                        }
                     }
                 }
@@ -178 +177 @@
                 exciseImageCube = true;
             }
-            psArrayElementsFree (pixels);
             psFree(pixels);
         }
@@ -756 +754 @@
 
 static bool
-warpedPixel(streakFiles *sfiles, PixelPos *cellCoord)
+warpedPixel(streakFiles *sfiles, int x, int y)
 {
     PixelPos chipCoord;
@@ -767 +765 @@
     // we clip so that the streak calculation code doesn't have to
     // clipping here insures that we don't touch the overscan regions
-    if ((cellCoord->x < 0) || (cellCoord->x >= sfiles->inImage->numCols) ||
-        (cellCoord->y < 0) || (cellCoord->y >= sfiles->inImage->numRows)) {
+    if ((x < 0) || (x >= sfiles->inImage->numCols) ||
+        (y < 0) || (y >= sfiles->inImage->numRows)) {
         return false;
     }
 
-    cellToChipInt(&chipCoord.x, &chipCoord.y, sfiles->astrom, cellCoord->x, cellCoord->y);
+    cellToChipInt(&chipCoord.x, &chipCoord.y, sfiles->astrom, x, y);
 
     if (chipCoord.x < 0 || chipCoord.x >= sfiles->warpedPixels->numCols) {
@@ -839 +837 @@
     }
 
-    printf("Censored %d sources\n", numCensored);
-
     // get rid of unused elements (don't know if this is necessary)
     psArrayRealloc(outTable, j);
 
     addDestreakKeyword(in->header);
-    if (! psFitsWriteTable(out->fits, in->header, outTable, extname)) {
-        psError(PS_ERR_IO, false, "failed to write table to %s", out->resolved_name);
-        streaksExit("", PS_EXIT_DATA_ERROR);
+    if (psArrayLength(outTable) > 0) {
+        printf("Censored %d sources\n", numCensored);
+        if (! psFitsWriteTable(out->fits, in->header, outTable, extname)) {
+            psError(PS_ERR_IO, false, "failed to write table to %s", out->resolved_name);
+            streaksExit("", PS_EXIT_DATA_ERROR);
+        }
+    } else {
+        printf("Censored ALL %d sources\n", numCensored);
+        if (! psFitsWriteTableEmpty(out->fits, in->header, inTable->data[0], extname)) {
+            psError(PS_ERR_IO, false, "failed to write empty table to %s", out->resolved_name);
+            streaksExit("", PS_EXIT_DATA_ERROR);
+        }
     }