Changeset 20991

Timestamp:

Dec 14, 2008, 2:48:22 PM (17 years ago)

Author:

eugene

Message:

when defining the CR mask, ignore masked pixels

File:

• branches/eam_branch_20081214/psphot/src/psphotSourceSize.c (modified) (13 diffs)

branches/eam_branch_20081214/psphot/src/psphotSourceSize.c

@@ -3 +3 @@
 
 // XXX This should be a recipe variable
-# define SN_LIMIT 5.0
+# define SN_LIMIT 3.0
 
 static float psphotModelContour(const psImage *image, const psImage *weight, const psImage *mask,
@@ -330 +330 @@
     int xe = pixels->numCols;
     for (int ix = xo; ix >= 0; ix--) {
+        if (mask->data.U8[yo][ix] & maskVal) {
+            continue;
+        }
         float SN = pixels->data.F32[yo][ix] / sqrt(weight->data.F32[yo][ix]);
         if (SN < SN_LIMIT) {
-            xs = ix + 1;
             break;
         }
@@ -338 +340 @@
         psVectorAppend (xf, (float) ix);
         psVectorAppend (yf, (float) yo);
+        xs = ix;
     }
     for (int ix = xo + 1; ix < pixels->numCols; ix++) {
+        if (mask->data.U8[yo][ix] & maskVal) {
+            continue;
+        }
         float SN = pixels->data.F32[yo][ix] / sqrt(weight->data.F32[yo][ix]);
         if (SN < SN_LIMIT) {
-            xe = ix;
             break;
         } 
@@ -348 +353 @@
         psVectorAppend (xf, (float) ix);
         psVectorAppend (yf, (float) yo);
-    }
-    psphotVisualShowCRMask (xf, yf);
+        xe = ix + 1;
+    }
+    // psphotVisualShowCRMask (xf, yf);
+    // fprintf (stderr, "first line: %d : %d - %d\n", yo, xs, xe);
 
     int startXs = xs;
@@ -369 +376 @@
         // first, try all of the pixels in the valid range (xs < x < xe guaranteed to be real pixels)
         for (int ix = xs; ix < xe; ix++) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
@@ -383 +393 @@
         // next, try the pixels to the left of the valid range for the previous row
         for (int ix = xs - 1; ix >= 0; ix--) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
-                newXs = ix + 1;
                 break;
             }
@@ -392 +404 @@
             psVectorAppend (xf, (float) ix);
             psVectorAppend (yf, (float) iy);
+            newXs = ix;
         }
 
         // finally, try the pixels to the right of the valid range for the previous row
         for (int ix = xe; ix < pixels->numCols; ix++) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
-                newXe = ix;
                 break;
             }
@@ -405 +420 @@
             psVectorAppend (xf, (float) ix);
             psVectorAppend (yf, (float) iy);
-        }
+            newXe = ix + 1;
+        }
+        // fprintf (stderr, "down line: %d : %d - %d\n", iy, newXs, newXe);
 
         xs = newXs;
         xe = newXe;
     }
-    psphotVisualShowCRMask (xf, yf);
+    // psphotVisualShowCRMask (xf, yf);
 
     xs = startXs;
@@ -430 +447 @@
         // first, try all of the pixels in the valid range (xs < x < xe guaranteed to be real pixels)
         for (int ix = xs; ix < xe; ix++) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
@@ -444 +464 @@
         // next, try the pixels to the left of the valid range for the previous row
         for (int ix = xs - 1; ix >= 0; ix--) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
-                newXs = ix + 1;
                 break;
             }
@@ -453 +475 @@
             psVectorAppend (xf, (float) ix);
             psVectorAppend (yf, (float) iy);
+            newXs = ix;
         }
 
         // finally, try the pixels to the right of the valid range for the previous row
         for (int ix = xe; ix < pixels->numCols; ix++) {
+            if (mask->data.U8[iy][ix] & maskVal) {
+                continue;
+            }
             float SN = pixels->data.F32[iy][ix] / sqrt(weight->data.F32[iy][ix]);
             if (SN < SN_LIMIT) {
-                newXe = ix;
                 break;
             }
@@ -466 +491 @@
             psVectorAppend (xf, (float) ix);
             psVectorAppend (yf, (float) iy);
-        }
+            newXe = ix + 1;
+        }
+        // fprintf (stderr, "up line: %d : %d - %d\n", iy, newXs, newXe);
 
         xs = newXs;
@@ -472 +499 @@
     }
 
-    psphotVisualShowCRMask (xf, yf);
+    // psphotVisualShowCRMask (xf, yf);
     psFree (xf);
     psFree (yf);