Changeset 21172

Timestamp:

Jan 26, 2009, 2:00:45 PM (17 years ago)

Author:

eugene

Message:

adding mask and maskVal to vector eval functions

Location:

trunk

Files:

• psLib/src/imageops/psImageMap.c (modified) (3 diffs)
• psLib/src/imageops/psImageMap.h (modified) (2 diffs)
• psLib/src/imageops/psImageMapFit.c (modified) (2 diffs)
• psModules/src/objects/pmTrend2D.c (modified) (3 diffs)
• psModules/src/objects/pmTrend2D.h (modified) (2 diffs)

trunk/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-17 02:37:28 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 00:00:21 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -353 +353 @@
 }
 
-psVector *psImageMapEvalVector(const psImageMap *map, const psVector *x, const psVector *y)
+psVector *psImageMapEvalVector(const psImageMap *map, const psVector *mask, psMaskType maskValue, const psVector *x, const psVector *y)
 {
     PS_ASSERT_IMAGE_MAP_NON_NULL(map, NULL);
@@ -365 +365 @@
 
     for (int i = 0; i < x->n; i++) {
-        result->data.F32[i] = psImageUnbinPixel(x->data.F32[i], y->data.F32[i], map->map, map->binning);
+      if (mask && (mask->data.U8[i] & maskValue)) {
+        result->data.F32[i] = 0.0;
+      } else {  
+        result->data.F32[i] = psImageUnbinPixel(x->data.F32[i], y->data.F32[i], map->map, map->binning);
+      }
     }
 

trunk/psLib/src/imageops/psImageMap.h

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-07 22:23:06 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 00:00:21 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -77 +77 @@
 
 // apply the psImageMap to the given coordinate vectors (fine image pixels)
-psVector *psImageMapEvalVector (const psImageMap *map, const psVector *x, const psVector *y);
+psVector *psImageMapEvalVector (const psImageMap *map, const psVector *mask, psMaskType maskValue, const psVector *x, const psVector *y);
 
 /// @}

trunk/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.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 00:00:21 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -397 +397 @@
         }
 
-        psVector *fit = psImageMapEvalVector(map, x, y);
+        psVector *fit = psImageMapEvalVector(map, mask, maskValue, x, y);
         if (fit == NULL) {
             psError(PS_ERR_UNKNOWN, false, "Failure in psImageMapEvalVector().\n");

trunk/psModules/src/objects/pmTrend2D.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-07 22:47:04 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 00:00:44 $
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
  *
@@ -234 +234 @@
 }
 
-psVector *pmTrend2DEvalVector(const pmTrend2D *trend, const psVector *x, const psVector *y)
+psVector *pmTrend2DEvalVector(const pmTrend2D *trend, psVector *mask, psMaskType maskValue, const psVector *x, const psVector *y)
 {
     PM_ASSERT_TREND2D_NON_NULL(trend, NULL);
@@ -244 +244 @@
       case PM_TREND_POLY_ORD:
       case PM_TREND_POLY_CHEB:
+        // XXX supply a mask here as well.
         result = psPolynomial2DEvalVector (trend->poly, x, y);
         break;
 
       case PM_TREND_MAP:
-        result = psImageMapEvalVector (trend->map, x, y);
+        result = psImageMapEvalVector (trend->map, mask, maskValue, x, y);
         break;
 

trunk/psModules/src/objects/pmTrend2D.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-07 22:47:04 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 00:00:45 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -90 +90 @@
                      float x, float y
     );
-psVector *pmTrend2DEvalVector(const pmTrend2D *trend,
+psVector *pmTrend2DEvalVector(const pmTrend2D *trend, psVector *mask, psMaskType maskValue, 
                               const psVector *x, const psVector *y
     );