Changeset 15841 for trunk/psLib/src/imageops/psImageMap.h

Timestamp:

Dec 14, 2007, 3:20:03 PM (18 years ago)

Author:

Paul Price

Message:

A little bit of cleaning up, and making it so that the statistic to be used may be specified.

File:

• trunk/psLib/src/imageops/psImageMap.h (modified) (4 diffs)

trunk/psLib/src/imageops/psImageMap.h

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-13 18:23:17 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-12-15 01:20:03 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -18 +18 @@
 /// @addtogroup ImageOps Image Operations
 /// @{
+
+#include <psStats.h>
+#include <psImage.h>
+#include <psImageBinning.h>
+#include <psVector.h>
 
 // a structure to describe the 2D variations of some quantity as a function of position the
@@ -33 +38 @@
     int nPoor;
     int nGood;
+    psStatsOptions singleMean, singleStdev;  // Statistics for mean and stdev when there's a single pixel
 } psImageMap;
 
@@ -43 +49 @@
 
 // generate a psImageMap (or NULL) with the given number of superpixels in X and Y
-bool psImageMapGenerate (psImageMap *map, psVector *x, psVector *y, psVector *f, psVector *df, float badFrac);
+bool psImageMapGenerate (psImageMap *map, const psVector *x, const psVector *y, const psVector *f, const psVector *df, float badFrac);
 
-bool psImageMapGenerateScale (psImageMap *map, psVector *x, psVector *y, psVector *f, psVector *df, float badFrac);
+bool psImageMapGenerateScale (psImageMap *map, const psVector *x, const psVector *y, const psVector *f, const psVector *df, float badFrac);
 
 // apply the psImageMap to the given coordinate (fine image pixels)
-double psImageMapEval (psImageMap *map, float x, float y);
+double psImageMapEval (const psImageMap *map, float x, float y);
 
 // apply the psImageMap to the given coordinate vectors (fine image pixels)
-psVector *psImageMapEvalVector (psImageMap *map, psVector *x, psVector *y);
-
-// fit the image map to a set of points
-bool psImageMapFit (psImageMap *map, psVector *mask, psMaskType maskValue, psVector *x, psVector *y, psVector *f, psVector *df);
-
-// fit the image map to a set of points
-bool psImageMapClipFit (psImageMap *map, psStats *stats, psVector *mask, psMaskType maskValue, psVector *x, psVector *y, psVector *f, psVector *df);
-
-bool psImageMapFit1DinY (psImageMap *map, psVector *mask, psMaskType maskValue, psVector *x, psVector *y, psVector *f, psVector *df);
-bool psImageMapFit1DinX (psImageMap *map, psVector *mask, psMaskType maskValue, psVector *x, psVector *y, psVector *f, psVector *df);
+psVector *psImageMapEvalVector (const psImageMap *map, const psVector *x, const psVector *y);
 
 /// @}