Changeset 14773

Timestamp:

Sep 7, 2007, 10:19:05 AM (19 years ago)

Author:

magnier

Message:

fixed small errors in the value of nX,Yskip; added GetRuff, GetFine APIs

Location:

branches/eam_branch_20070830/psLib/src/imageops

Files:

• psImageBinning.c (modified) (7 diffs)
• psImageBinning.h (modified) (2 diffs)

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

@@ -8 +8 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-31 02:59:41 $
+ *  @version $Revision: 1.2.8.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-07 20:19:02 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -44 +44 @@
     assert (binning->nYbin > 0);
 
+    // force nXruff*nXbin > nXfine
     binning->nXruff = binning->nXfine / binning->nXbin;
     if (binning->nXfine % binning->nXbin) binning->nXruff ++;
 
+    // force nYruff*nYbin > nYfine
     binning->nYruff = binning->nYfine / binning->nYbin;
     if (binning->nYfine % binning->nYbin) binning->nYruff ++;
@@ -56 +58 @@
         break;
       case PS_IMAGE_BINNING_CENTER:
-        binning->nXoff = ((binning->nXruff * binning->nXbin) % binning->nXfine) / 2;
-        binning->nYoff = ((binning->nYruff * binning->nYbin) % binning->nYfine) / 2;
+        binning->nXoff = (binning->nXruff * binning->nXbin - binning->nXfine) / 2;
+        binning->nYoff = (binning->nYruff * binning->nYbin - binning->nYfine) / 2;
         break;
       case PS_IMAGE_BINNING_RIGHT:
-        binning->nXoff = ((binning->nXruff * binning->nXbin) % binning->nXfine);
-        binning->nYoff = ((binning->nYruff * binning->nYbin) % binning->nYfine);
+        binning->nXoff = (binning->nXruff * binning->nXbin - binning->nXfine);
+        binning->nYoff = (binning->nYruff * binning->nYbin - binning->nYfine);
         break;
       default:
@@ -78 +80 @@
 void psImageBinningSetSkip(psImageBinning *binning, psImage *image) {
 
-    binning->nXskip = image->col0 - binning->nXoff;
-    binning->nYskip = image->row0 - binning->nYoff;
+    if (image != NULL) {
+        binning->nXskip = image->col0 - binning->nXoff;
+        binning->nYskip = image->row0 - binning->nYoff;
+    } else {
+        binning->nXskip = 0 - binning->nXoff;
+        binning->nYskip = 0 - binning->nYoff;
+    }
     return;
 }
@@ -90 +97 @@
     assert (binning->nYruff > 0);
 
+    // force nXruff*nXbin > nXfine
     binning->nXbin = binning->nXfine / binning->nXruff;
     if (binning->nXfine % binning->nXruff) binning->nXbin ++;
 
+    // force nYruff*nYbin > nYfine
     binning->nYbin = binning->nYfine / binning->nYruff;
     if (binning->nYfine % binning->nYruff) binning->nYbin ++;
@@ -102 +111 @@
         break;
       case PS_IMAGE_BINNING_CENTER:
-        binning->nXoff = (binning->nXfine % binning->nXbin) / 2;
-        binning->nYoff = (binning->nYfine % binning->nYbin) / 2;
+        binning->nXoff = (binning->nXruff * binning->nXbin - binning->nXfine) / 2;
+        binning->nYoff = (binning->nYruff * binning->nYbin - binning->nYfine) / 2;
         break;
       case PS_IMAGE_BINNING_RIGHT:
-        binning->nXoff = (binning->nXfine % binning->nXbin);
-        binning->nYoff = (binning->nYfine % binning->nYbin);
+        binning->nXoff = (binning->nXruff * binning->nXbin - binning->nXfine);
+        binning->nYoff = (binning->nYruff * binning->nYbin - binning->nYfine);
         break;
       default:
@@ -137 +146 @@
 }
 
-/*** pmFPACopy.c:binRegion had the following logic ***/
-# if (0)
-    // Want to include the lower bound: 1 binned by 4 --> 0; 3 binned by 4 --> 0; 4 binned by 4 --> 1
-    region->x0 = (int)(region->x0 / xBin);
-    region->y0 = (int)(region->y0 / yBin);
-    // Want to exclude the upper bound: 4 binned by 4 --> 1; 5 binned by 4 --> 2; 7 binned by 4 --> 2
-    region->x1 = (int)((region->x1 + xBin - 1) / xBin);
-    region->y1 = (int)((region->y1 + yBin - 1) / yBin);
-# endif
 
-/* 
- * dvoMakeCorrUnbin ** OK
- * psphotImageMedian ** OK?
- * psphotMagnitudes ** OK
- * pmFPACopy ** OK
- * pmConceptsUpdate ** OK
- * pmFPAMosaic ** OK (needs more use of psImageBinning functions)
- * psImageUnbin 
- * psImageRebin
- * ppImageRebinReadout
- */
+// convert the fine coordinate to the ruff coordinate
+float psImageBinningGetRuffX (psImageBinning *binning, float xFine) {
+    float xRuff = (xFine - binning->nXskip)/binning->nXbin;
+    return xRuff;
+}
+float psImageBinningGetRuffY (psImageBinning *binning, float yFine) {
+    float 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;
+    return xFine;
+}
+float psImageBinningGetFineY (psImageBinning *binning, float yRuff) {
+    float 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 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-09 01:40:07 $
+ *  @version $Revision: 1.2.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-07 20:19:05 $
  *
  *  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);
+
 /// @}
 #endif // #ifndef PS_IMAGE_GEOM_MANIP_H