Changeset 21074 for branches/eam_branch_20081230/psLib/src/imageops/psImageMapFit.c

Timestamp:

Dec 30, 2008, 10:40:00 AM (18 years ago)

Author:

eugene

Message:

upgrades to the masking concepts: added psImageMaskType & psVectorMaskType and associated macros; replaced psMaskType where appropriate (see src/mask.notes.txt)

File:

• branches/eam_branch_20081230/psLib/src/imageops/psImageMapFit.c (modified) (11 diffs)

branches/eam_branch_20081230/psLib/src/imageops/psImageMapFit.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-13 01:55:48 $
+ *  @version $Revision: 1.11.8.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-30 20:40:00 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -47 +47 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit(psImageMap *map, const psVector *mask, psMaskType maskValue,
+bool psImageMapFit(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                    const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -145 +145 @@
             for (int i = 0; i < x->n; i++) {
 
-                if (mask && (mask->data.U8[i] & maskValue)) continue;
+                if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskValue)) continue;
 
                 // base coordinate offset for this point (x,y) relative to this map element (n,m)
@@ -338 +338 @@
 
 // measure residuals on each pass and clip outliers based on stats
-bool psImageMapClipFit(psImageMap *map, psStats *stats, psVector *inMask, psMaskType maskValue,
+bool psImageMapClipFit(psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
                        const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -377 +377 @@
     psVector *mask = inMask;
     if (!inMask) {
-        mask = psVectorAlloc (x->n, PS_TYPE_U8);
+        mask = psVectorAlloc (x->n, PS_TYPE_VECTOR_MASK);
         psVectorInit (mask, 0);
     }
@@ -429 +429 @@
         for (psS32 i = 0; i < resid->n; i++) {
             // XXX this prevents recovery of previously masked values
-            if (mask->data.U8[i] & maskValue) {
+            if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskValue) {
                 continue;
             }
@@ -435 +435 @@
             if ((resid->data.F32[i] - meanValue > maxClipValue) || (resid->data.F32[i] - meanValue < minClipValue)) {
                 psTrace("psLib.imageops", 6, "Masking element %d  : %f vs %f : resid is %f\n", i, f->data.F32[i], fit->data.F32[i], resid->data.F32[i]);
-                mask->data.U8[i] |= 0x01;
+                mask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= 0x01;
                 continue;
             }
@@ -455 +455 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinY(psImageMap *map, const psVector *mask, psMaskType maskValue,
+bool psImageMapFit1DinY(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -490 +490 @@
         for (int i = 0; i < y->n; i++) {
 
-            if (mask && (mask->data.U8[i] & maskValue)) continue;
+            if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskValue)) continue;
 
             float dy = psImageBinningGetRuffY (map->binning, y->data.F32[i]) - (m + 0.5);
@@ -603 +603 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinX(psImageMap *map, const psVector *mask, psMaskType maskValue,
+bool psImageMapFit1DinX(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -638 +638 @@
         for (int i = 0; i < x->n; i++) {
 
-            if (mask && (mask->data.U8[i] & maskValue)) continue;
+            if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskValue)) continue;
 
             float dx = psImageBinningGetRuffX (map->binning, x->data.F32[i]) - (m + 0.5);