Changeset 14859 for branches/eam_branch_20070830/psLib/src/imageops/psImageBinning.c

Timestamp:

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

Author:

magnier

Message:

working on the psImageMap fitting process

File:

• branches/eam_branch_20070830/psLib/src/imageops/psImageBinning.c (modified) (2 diffs)

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;
 }