Changeset 12588

Timestamp:

Mar 26, 2007, 4:43:22 PM (19 years ago)

Author:

magnier

Message:

created a common set of routines to define the binning parameters

Location:

trunk/psLib/src

Files:

• imageops/Makefile.am (modified) (2 diffs)
• imageops/psImageBinning.c (added)
• imageops/psImageBinning.h (added)
• imageops/psImageUnbin.c (modified) (6 diffs)
• imageops/psImageUnbin.h (modified) (2 diffs)
• pslib_strict.h (modified) (4 diffs)

trunk/psLib/src/imageops/Makefile.am

@@ -13 +13 @@
         psImageStructManip.c \
         psImageMaskOps.c \
+        psImageBinning.c \
         psImageUnbin.c
 
@@ -26 +27 @@
         psImageStructManip.h \
         psImageMaskOps.h \
+        psImageBinning.h \
         psImageUnbin.h
 

trunk/psLib/src/imageops/psImageUnbin.c

@@ +1 @@
+/** @file  psImageUnbin.c
+ *
+ *  @brief Functions to perform unbinning (resampling) of images.
+ *
+ *  @ingroup Image
+ *
+ *  @author Eugene Magnier, IfA
+ *
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-27 02:43:22 $
+ *
+ *  Copyright 2007 Institute for Astronomy, University of Hawaii
+ */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -4 +18 @@
 
 #include <stdio.h>
-
 #include "psError.h"
+#include "psAssert.h"
+#include "psRegion.h"
 #include "psImage.h"
-#include "psAssert.h"
+#include "psImageBinning.h"
 #include "psImageUnbin.h"
 
@@ -15 +30 @@
 // binned pixel. 
 // XXX check that this is still consistent with psphotImageMedian...
-psImage *psImageUnbin(psImage *out, const psImage *in, int DX, int DY, int dx, int dy)
+psImage *psImageUnbin(psImage *out, const psImage *in, const psImageBinning *binning)
 {
     PS_ASSERT_IMAGE_NON_NULL(in, NULL);
     PS_ASSERT_IMAGE_NON_NULL(out, NULL);
+
+    int DX = binning->nXbin;
+    int DY = binning->nYbin;
+    int dx = binning->nXskip;
+    int dy = binning->nYskip;
+
     PS_ASSERT_INT_POSITIVE(DX, NULL);
     PS_ASSERT_INT_POSITIVE(DY, NULL);
@@ -28 +49 @@
     long Nx = out->numCols;
     long Ny = out->numRows;
+
+    // XXX validate the binning structure vs the input and output images?
 
     psF32 **vIn = in->data.F32;
@@ -183 +206 @@
  * cases should be added
  */
-double psImageUnbinPixel(const int ix, const int iy, // desired Unbinned point
+double psImageUnbinPixel(const int ix, const int iy, // desired Unbinned point (parent coords)
                          const psImage *in, // binned image
-                         const int DX, const int DY,  //!< Scaling factors in x and y
-                         const int dx, const int dy)   //!< Overhang
+                         const psImageBinning *binning)   //!< Overhang
 {
+
+    int DX = binning->nXbin;
+    int DY = binning->nYbin;
+    int dx = binning->nXskip;
+    int dy = binning->nYskip;
+
     PS_ASSERT_IMAGE_NON_NULL(in, NAN);
     assert (in->type.type == PS_TYPE_F32);
+
     PS_ASSERT_INT_POSITIVE(DX, NAN);
     PS_ASSERT_INT_POSITIVE(DY, NAN);
@@ -197 +226 @@
      * Find which binned pixel we're in
      */
-    const int Xs = (ix + dx)/DX; // index of binned pixel
-    const int Ys = (iy + dy)/DY;
+
+    const int Xs = (ix - dx)/DX; // index of binned pixel
+    const int Ys = (iy - dy)/DY;
     if (Xs < 0 || Xs >= in->numCols || Ys < 0 || Ys >= in->numRows) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Point (%d,%d) lies outside binned image", ix, iy);

trunk/psLib/src/imageops/psImageUnbin.h

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  $Date: 2007-01-23 22:47:23 $
+ *  $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  $Date: 2007-03-27 02:43:22 $
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -17 +17 @@
 /// @{
 
-#include "psImage.h"
-
 // This needs to be considered more carefully
 psImage *psImageUnbin (psImage *out,    //!< Output image
                        const psImage *in, //!< Input image
-                       int DX, int DY,  //!< Scaling factors in x and y
-                       int dx, int dy   //!< Overhang
-                      );
+                       const psImageBinning *binning ///< binning definition
+    );
+
 double psImageUnbinPixel(const int ix, const int iy, //!< desired Unbinned point
                          const psImage *in, //!< binned image
-                         const int DX, const int DY,  //!< Scaling factors in x and y
-                         const int dx, const int dy   //!< Overhang
+                         const psImageBinning *binning ///< binning definition
                         );
 

trunk/psLib/src/pslib_strict.h

@@ -9 +9 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-06 21:55:28 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-27 02:43:22 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 //#include "psXML.h"
 
+#include "psRegion.h"
 #include "psImageConvolve.h"
 #include "psImageGeomManip.h"
@@ -50 +51 @@
 #include "psImageStructManip.h"
 #include "psImageMaskOps.h"
+#include "psImageBinning.h"
 #include "psImageUnbin.h"
 
@@ -65 +67 @@
 #include "psMinimizePolyFit.h"
 #include "psRandom.h"
-#include "psRegion.h"
 #include "psRegionForImage.h"
 #include "psPolynomial.h"