Changeset 14859

Timestamp:

Sep 15, 2007, 9:43:43 AM (19 years ago)

Author:

magnier

Message:

working on the psImageMap fitting process

Location:

branches/eam_branch_20070830/psLib

Files:

• src/imageops/Makefile.am (modified) (1 diff)
• src/imageops/psImageBinning.c (modified) (2 diffs)
• src/imageops/psImageBinning.h (modified) (2 diffs)
• src/imageops/psImageMap.h (modified) (2 diffs)
• src/imageops/psImageMapFit.c (added)
• src/imageops/psImageUnbin.c (modified) (3 diffs)
• src/imageops/psImageUnbin.h (modified) (2 diffs)
• test/imageops/Makefile.am (modified) (1 diff)
• test/imageops/tap_psImageMapFit.c (added)
• test/imageops/tap_psImageMapFit2.c (added)

branches/eam_branch_20070830/psLib/src/imageops/Makefile.am

@@ -16 +16 @@
         psImageBinning.c \
         psImageMap.c \
+        psImageMapFit.c \
         psImagePixelInterpolate.c \
         psImageUnbin.c

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

@@ -8 +8 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.2.8.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:19:02 $
+ *  @version $Revision: 1.2.8.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-15 19:43:43 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -148 +148 @@
 
 // convert the fine coordinate to the ruff coordinate
-float psImageBinningGetRuffX (psImageBinning *binning, float xFine) {
-    float xRuff = (xFine - binning->nXskip)/binning->nXbin;
+double psImageBinningGetRuffX (const psImageBinning *binning, const double xFine) {
+
+    PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN);
+    PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);
+
+    double xRuff = (xFine - binning->nXskip)/binning->nXbin;
     return xRuff;
 }
-float psImageBinningGetRuffY (psImageBinning *binning, float yFine) {
-    float yRuff = (yFine - binning->nYskip)/binning->nYbin;
+double psImageBinningGetRuffY (const psImageBinning *binning, const double yFine) {
+
+    PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN);
+    PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);
+
+    double yRuff = (yFine - binning->nYskip)/binning->nYbin;
     return yRuff;
 }
 
 // convert the ruff coordinate to the fine coordinate
-float psImageBinningGetFineX (psImageBinning *binning, float xRuff) {
-    float xFine = xRuff * binning->nXbin + binning->nXskip;
+double psImageBinningGetFineX (const psImageBinning *binning, const double xRuff) {
+
+    PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN);
+    PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);
+
+    double xFine = xRuff * binning->nXbin + binning->nXskip;
     return xFine;
 }
-float psImageBinningGetFineY (psImageBinning *binning, float yRuff) {
-    float yFine = yRuff * binning->nYbin + binning->nYskip;
+double psImageBinningGetFineY (const psImageBinning *binning, const double yRuff) {
+
+    PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN);
+    PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);
+
+    double yFine = yRuff * binning->nYbin + binning->nYskip;
     return yFine;
 }

branches/eam_branch_20070830/psLib/src/imageops/psImageBinning.h

@@ -8 +8 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.2.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:19:05 $
+ *  @version $Revision: 1.2.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-15 19:43:43 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -51 +51 @@
 psRegion psImageBinningSetRuffRegion (psImageBinning *binning, psRegion fineRegion);
 
-float psImageBinningGetRuffX (psImageBinning *binning, float xFine);
-float psImageBinningGetRuffY (psImageBinning *binning, float yFine);
-float psImageBinningGetFineX (psImageBinning *binning, float xRuff);
-float psImageBinningGetFineY (psImageBinning *binning, float yRuff);
+double psImageBinningGetRuffX (const psImageBinning *binning, const double xFine);
+double psImageBinningGetRuffY (const psImageBinning *binning, const double yFine);
+double psImageBinningGetFineX (const psImageBinning *binning, const double xRuff);
+double psImageBinningGetFineY (const psImageBinning *binning, const double yRuff);
 
 /// @}

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

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:19:35 $
+ *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-15 19:43:43 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -48 +48 @@
 psVector *psImageMapEvalVector (psImageMap *map, psVector *x, psVector *y);
 
+// fit the image map to a set of points
+bool psImageMapFit (psImageMap *map, psVector *x, psVector *y, psVector *f, psVector *df);
+
 /// @}
 #endif // #ifndef PS_IMAGE_MAP_H

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

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-27 02:43:22 $
+ *  @version $Revision: 1.7.8.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-15 19:43:43 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -205 +205 @@
  * N.b. This code only works for the central part of the image; the edge
  * cases should be added
+
+ * XXXX this is bilinear interpolation, but written sub-optimally
+ * XXXX this function should be taking float input coordinates!!!
  */
 double psImageUnbinPixel(const int ix, const int iy, // desired Unbinned point (parent coords)
@@ -249 +252 @@
     return Vxs + (Vxe - Vxs)*(ix - xs)/DX; // value at [iy][ix]
 }
+
+double psImageUnbinPixel_V2(const double xFine, const double yFine, // desired Unbinned point (parent coords)
+                            const psImage *in, // binned image
+                            const psImageBinning *binning)   //!< Overhang
+{
+    PS_ASSERT_IMAGE_NON_NULL(in, NAN);
+    assert (in->type.type == PS_TYPE_F32);
+
+    const float xRuff = psImageBinningGetRuffX (binning, xFine);
+    const float yRuff = psImageBinningGetRuffY (binning, yFine);
+
+    const double value = psImageInterpolatePixelBilinear (xRuff, yRuff, in);
+
+    return value;
+}
+
+// fast & simple API to interpolate to a subpixel position using bilinear interpolation
+// x,y in parent image coordinates (pixel centers at 0.5, 0.5)
+double psImageInterpolatePixelBilinear (const double xIn, const double yIn, const psImage *in) {
+
+    PS_ASSERT_PTR_NON_NULL(in, PS_ERR_BAD_PARAMETER_VALUE);
+    assert (in->type.type == PS_TYPE_F32);
+
+    const double x = xIn - in->col0;
+    const double y = yIn - in->row0;
+
+    // allow extrapolation to edge of valid pixels, but not beyond
+    if ((x < 0) || (x >= in->numCols) || (y < 0) || (y >= in->numRows)) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Point (%f,%f) lies outside binned image", x, y);
+        return NAN;
+    }
+
+    // handle edge cases with extrapolation
+
+    const int ix = x - 0.5; // index of reference pixel
+    const int iy = y - 0.5; // index of reference pixel
+
+    const int Xs = PS_MAX (PS_MIN (ix, in->numCols - 2), 0);
+    const int Ys = PS_MAX (PS_MIN (iy, in->numRows - 2), 0);
+
+    const int Xe = Xs + 1;
+    const int Ye = Ys + 1;
+
+    // dx,dy range from 0.0 to 1.0 for interpolated pixels, and -0.5 to 1.5 for extrapolation
+    const double dx = x - 0.5 - Xs;
+    const double dy = y - 0.5 - Ys;
+
+    const double rx = 1.0 - dx;
+    const double ry = 1.0 - dy;
+
+    // Vxy 
+    double V00 = in->data.F32[Ys][Xs];
+    double V10 = in->data.F32[Ys][Xe];
+    double V01 = in->data.F32[Ye][Xs];
+    double V11 = in->data.F32[Ye][Xe];
+
+    // bilinear interpolation
+    const double value = V00*rx*ry + V10*rx*dy + V01*dx*ry + V11*dx*dy;
+
+    return value;
+}
+
+    

branches/eam_branch_20070830/psLib/src/imageops/psImageUnbin.h

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  $Date: 2007-03-27 02:43:22 $
+ *  $Revision: 1.4.8.1 $ $Name: not supported by cvs2svn $
+ *  $Date: 2007-09-15 19:43:43 $
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -28 +28 @@
                         );
 
+double psImageUnbinPixel_V2(const double xFine, const double yFine, // desired Unbinned point (parent coords)
+                            const psImage *in, // binned image
+                            const psImageBinning *binning   //!< Overhang
+    );
+
+double psImageInterpolatePixelBilinear (const double xIn, const double yIn, const psImage *in);
+
 /// @}
 #endif

branches/eam_branch_20070830/psLib/test/imageops/Makefile.am

@@ -23 +23 @@
         tap_psImageInterpolate2 \
         tap_psImageMap \
+        tap_psImageMapFit \
         tap_psImageMaskOps