Changeset 15254 for trunk/psModules/src/objects

Timestamp:

Oct 9, 2007, 9:27:04 AM (19 years ago)

Author:

eugene

Message:

changed mask to coeffMask, define PS_POLY_MASK_FIT,SET; distinguish between coeffs masked for fitting (FIT) and masked for evaluation (SET)

Location:

trunk/psModules/src/objects

Files:

• pmPSF_IO.c (modified) (3 diffs)
• pmPSFtry.c (modified) (2 diffs)
• pmTrend2D.c (modified) (4 diffs)

trunk/psModules/src/objects/pmPSF_IO.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-06 01:02:49 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-09 19:26:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -358 +358 @@
                         psMetadataAddF32 (row, PS_LIST_TAIL, "VALUE",      0, "", poly->coeff[ix][iy]);
                         psMetadataAddF32 (row, PS_LIST_TAIL, "ERROR",      0, "", poly->coeffErr[ix][iy]);
-                        psMetadataAddU8  (row, PS_LIST_TAIL, "MASK",       0, "", poly->mask[ix][iy]);
+                        psMetadataAddU8  (row, PS_LIST_TAIL, "MASK",       0, "", poly->coeffMask[ix][iy]);
 
                         psArrayAdd (psfTable, 100, row);
@@ -710 +710 @@
             assert (xPow <= poly->nX);
             assert (yPow <= poly->nY);
-            poly->coeff[xPow][yPow]    = psMetadataLookupF32 (&status, row, "VALUE");
-            poly->coeffErr[xPow][yPow] = psMetadataLookupF32 (&status, row, "ERROR");
-            poly->mask[xPow][yPow]     = psMetadataLookupU8  (&status, row, "MASK");
+            poly->coeff[xPow][yPow]     = psMetadataLookupF32 (&status, row, "VALUE");
+            poly->coeffErr[xPow][yPow]  = psMetadataLookupF32 (&status, row, "ERROR");
+            poly->coeffMask[xPow][yPow] = psMetadataLookupU8  (&status, row, "MASK");
         }
     }

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-25 22:05:05 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-09 19:26:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -280 +280 @@
     // linear clipped fit of ApResid to r2rflux
     psPolynomial1D *poly = psPolynomial1DAlloc (PS_POLYNOMIAL_ORD, 1);
-    poly->mask[1] = 1; // fit only a constant offset (no SKYBIAS)
+    poly->coeffMask[1] = PS_POLY_MASK_SET; // fit only a constant offset (no SKYBIAS)
 
     // XXX replace this with a psVectorStats call?  since we are not fitting the trend

trunk/psModules/src/objects/pmTrend2D.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-24 21:27:58 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-09 19:26:25 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -48 +48 @@
             for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
                 if (nx + ny >= PS_MAX (trend->poly->nX, trend->poly->nY) + 1) {
-                    trend->poly->mask[nx][ny] = 1;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_SET;
                 } else {
-                    trend->poly->mask[nx][ny] = 0;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_NONE;
                 }
             }
@@ -96 +96 @@
             for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
                 if (nx + ny >= PS_MAX (trend->poly->nX, trend->poly->nY) + 1) {
-                    trend->poly->mask[nx][ny] = 1;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_SET;
                 } else {
-                    trend->poly->mask[nx][ny] = 0;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_NONE;
                 }
             }
@@ -137 +137 @@
             for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
                 if (nx + ny >= PS_MAX (trend->poly->nX, trend->poly->nY) + 1) {
-                    trend->poly->mask[nx][ny] = 1;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_SET;
                 } else {
-                    trend->poly->mask[nx][ny] = 0;
+                    trend->poly->coeffMask[nx][ny] = PS_POLY_MASK_NONE;
                 }
             }