Changeset 5607 for trunk/psphot/src/psLibUtils.h

Timestamp:

Nov 25, 2005, 5:00:41 PM (21 years ago)

Author:

eugene

Message:

updating to work with current psModules

File:

• trunk/psphot/src/psLibUtils.h (modified) (3 diffs)

trunk/psphot/src/psLibUtils.h

@@ -2 +2 @@
 # ifndef PS_LIB_UTILS
 # define PS_LIB_UTILS
-
-// XXX EAM : psEllipse needs to be be included in psLib
-# include "psEllipse.h"
 
 // structure to carry a dynamic string
@@ -13 +10 @@
 } psLine;
 
-# define psMemCopy(A)(psMemIncrRefCounter((A)))
-
-// XXX EAM : my version using varience instead of stdev
-bool psMinimizeGaussNewtonDelta_EAM (psVector *delta,
-                                     const psVector *params,
-                                     const psVector *paramMask,
-                                     const psArray  *x,
-                                     const psVector *y,
-                                     const psVector *yErr,
-                                     psMinimizeLMChi2Func func);
-
-// minimize : using varience vs sigma and parameter limits
-psBool       p_psMinLM_GuessABP_EAM (psImage  *Alpha, psVector *Beta, psVector *Params, const psImage  *alpha, const psVector *beta, const psVector *params, const psVector *paramMask, const psVector *beta_lim, const psVector *params_min, const psVector *params_max, psF64 lambda);
-psBool       psMinimizeLMChi2_EAM(psMinimization *min, psImage *covar, psVector *params, const psVector *paramMask, const psArray *x, const psVector *y, const psVector *yErr, psMinimizeLMChi2Func func);
-psF64        p_psMinLM_dLinear (const psVector *Beta, const psVector *beta, psF64 lambda);
-
-int          psImageCountPixelMask_EAM (psImage *mask, psU8 value); // added to SDRS
-
-// psLib extra utilities
-# if (0) // added to psLib v8
-int          psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
-int          psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
-bool         psTimerClear (char *name);   // added to SDRS 
-psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
-# endif
-
-bool         psTimerStart (char *name);   // added to SDRS
-psF64        psTimerMark (char *name);    // added to SDRS
-void         psTimerFree ();              // added to SDRS (as psTimerStop)
-psS32        psLogArguments (int *argc, char **argv);   // added to SDRS (part of psArgumentVerbosity)
-psS32        psTraceArguments (int *argc, char **argv); // added to SDRS (part of psArgumentVerbosity)
-
-// basic image functions
-bool         psImageInit (psImage *image,...); // added to SDRS (v.15)
-void         psImageSmooth_EAM (psImage *image, float sigma, float Nsigma); // added to SDRS (v.15)
-
 // psLine functions -- keep out for now?
 psLine      *psLineAlloc (int Nline);
@@ -54 +15 @@
 bool         psLineAdd (psLine *line, char *format, ...);
 
-// not included in the .h file -- these are fairly lame, keep out?
-bool p_psVectorPrint (int fd, psVector *a, char *name);
-bool p_psVectorPrintRow (int fd, psVector *a, char *name);
-
-// polynomial functions -- all in SDRS, not done for v.15
-// XXX the pslib 0.7.0 polynomials are *still* nTerm, not nOrder!!!
-psPolynomial1D *Polynomial1DAlloc_EAM(psPolynomialType type, psS32 nOrder);
-void            Polynomial1DDump_EAM(psPolynomial1D *poly);
-psF64           Polynomial1DEval_EAM(const psPolynomial1D* myPoly, psF64 x);
-psVector       *Polynomial1DEvalVector_EAM(const psPolynomial1D *myPoly, const psVector *x);
-psPolynomial1D *VectorFitPolynomial1D_EAM(psPolynomial1D* myPoly, psVector* mask, psMaskType maskValue, const psVector* y, const psVector* yErr, const psVector* x);
-psPolynomial1D *VectorClipFitPolynomial1D_EAM(psPolynomial1D* poly, psStats *stats, psVector* mask, psMaskType maskValue, const psVector* z, const psVector* zErr, const psVector* x);
-
-psPolynomial2D *Polynomial2DAlloc_EAM(psPolynomialType type, psS32 nXorder, psS32 nYorder);
-void            Polynomial2DDump_EAM(psPolynomial2D *poly);
-psF64           Polynomial2DEval_EAM(const psPolynomial2D* myPoly, psF64 x, psF64 y);
-psVector       *Polynomial2DEvalVector_EAM(const psPolynomial2D *myPoly, const psVector *x,const psVector *y);
-psVector       *Polynomial2DEvalVectorD_EAM(const psPolynomial2D *myPoly, const psVector *x,const psVector *y);
-psPolynomial2D *VectorFitPolynomial2D_EAM(psPolynomial2D* myPoly, psVector* mask, psMaskType maskValue, const psVector* z, const psVector* zErr, const psVector* x, const psVector* y);
-psPolynomial2D *VectorClipFitPolynomial2D_EAM(psPolynomial2D* poly, psStats *stats, psVector* mask, psMaskType maskValue, const psVector* z, const psVector* zErr, const psVector* x, const psVector* y);
-
 # endif