Changeset 14725 for branches/eam_branch_20070830/psLib/test/imageops/tap_psImageMap.c

Timestamp:

Sep 2, 2007, 10:29:50 AM (19 years ago)

Author:

magnier

Message:

fix compile bugs in psImageMap, psImagePixelInterpolate

File:

• branches/eam_branch_20070830/psLib/test/imageops/tap_psImageMap.c (modified) (4 diffs)

branches/eam_branch_20070830/psLib/test/imageops/tap_psImageMap.c

@@ -13 +13 @@
     return (TRUE);
 }
+
+# define C00 +0.5
+# define C01 +0.1
+# define C10 -0.2
 
 int main (void)
@@ -35 +39 @@
         psVector *f = psVectorAllocEmpty (100, PS_TYPE_F32);
 
-        for (int ix = 0; ix < 1000; ix += 25) {
-            for (int iy = 0; iy < 1000; iy += 25) {
+        for (int ix = 0; ix < 1000; ix += 10) {
+            for (int iy = 0; iy < 1000; iy += 10) {
                 x->data.F32[x->n] = ix;
                 y->data.F32[y->n] = iy;
@@ -52 +56 @@
 
         // allocate a map, but we have no field image to supply
-        bool status = psImageMapGenerate (map, x, y, f, 0.1);
+        // XXX this function needs to correct for the mean superpixel position 
+        // which is sampled...
+        psImageMapGenerate (map, x, y, f, 0.1);
         psFree (binning);
 
-        fprint  (stderr, "nGood: %d\n", map->nGood);
-        fprint  (stderr, "nPoor: %d\n", map->nPoor);
-        fprint  (stderr, "nBad:  %d\n", map->nBad);
+        fprintf (stderr, "nGood: %d\n", map->nGood);
+        fprintf (stderr, "nPoor: %d\n", map->nPoor);
+        fprintf (stderr, "nBad:  %d\n", map->nBad);
         
         SaveImage (NULL, map->map, "map.fits");
@@ -71 +77 @@
         // measure difference between model (map) and data (field)
         for (int ix = 0; ix < map->map->numCols; ix++) {
-            for (int iy = 0; iy < map->map->num; iy++) {
-                int xo = ix*map->binning->nXbin;
-                int yo = iy*map->binning->nYbin;
-                df = field->data.F32[yo][xo] - map->map->data.F32[iy][ix];
-                fprintf (stderr, "%d %d   %f = %f - %f\n", ix, iy, df, field->data.F32[yo][xo], map->map->data.F32[iy][ix]);
+            for (int iy = 0; iy < map->map->numRows; iy++) {
+              
+                int xo = (ix + 0.5)*map->binning->nXbin;
+                int yo = (iy + 0.5)*map->binning->nYbin;
+                float df = field->data.F32[yo][xo] - map->map->data.F32[iy][ix];
+                fprintf (stderr, "%d %d -> %d %d  :  %f = %f - %f\n", ix, iy, xo, yo, df, field->data.F32[yo][xo], map->map->data.F32[iy][ix]);
             }
         }