Changeset 14864 for branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c

Timestamp:

Sep 17, 2007, 10:17:21 AM (19 years ago)

Author:

magnier

Message:

added errors to psImageMap, NaN for unconstrained pixels in output map

File:

• branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c (modified) (6 diffs)

branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:19:35 $
+ *  @version $Revision: 1.1.2.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-17 20:17:21 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -39 +39 @@
 
     psFree (map->map);
-    // psFree (map->field); XXX ??? this should be freed here, but that causes an error...
+    psFree (map->error);
+    psFree (map->field); // XXX ??? this should be freed here, but that causes an error...
     psFree (map->stats);
     psFree (map->binning);
@@ -57 +58 @@
     map->field   = psMemIncrRefCounter (field);
     map->stats   = psMemIncrRefCounter (stats);
+
     map->map     = psImageAlloc (binning->nXruff, binning->nYruff, PS_TYPE_F32);
+    psImageInit (map->map, 0.0);
+
+    map->error   = psImageAlloc (binning->nXruff, binning->nYruff, PS_TYPE_F32);
+    psImageInit (map->error, 0.0);
 
     psImageBinningSetScale (map->binning, PS_IMAGE_BINNING_CENTER);
@@ -73 +79 @@
 
     psImageRecycle (map->map, nXruff, nYruff, PS_TYPE_F32);
+    psImageRecycle (map->error, nXruff, nYruff, PS_TYPE_F32);
 
     psImageBinningSetScale (map->binning, PS_IMAGE_BINNING_CENTER);
@@ -257 +264 @@
 }
 
+// x,y are in fractional pixel coords of the fine image (pixel center: 0.5)
 double psImageMapEval (psImageMap *map, float x, float y) {
 
     double result;
 
-    result = psImageUnbinPixel(x, y, map->map, map->binning);
+    result = psImageUnbinPixel_V2(x, y, map->map, map->binning);
 
     return result; 
@@ -276 +284 @@
 
     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);
+        result->data.F32[i] = psImageUnbinPixel_V2(x->data.F32[i], y->data.F32[i], map->map, map->binning);
     }