IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 28, 2005, 11:20:47 PM (21 years ago)
Author:
magnier
Message:

checking in pmObjects changes already submitted to bugzilla

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/eam-psphot-branch/psModules/src/pmObjects.h

    r3676 r3790  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.7.2.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-04-06 19:34:06 $
     7 *  @version $Revision: 1.7.2.1.2.1 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-04-29 09:20:47 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    5454
    5555typedef enum {
    56     PS_MODEL_GAUSS,  ///< Regular 2-D Gaussian
     56    PS_MODEL_GAUSS,   ///< Regular 2-D Gaussian
    5757    PS_MODEL_PGAUSS,  ///< Psuedo 2-D Gaussian
    5858    PS_MODEL_TWIST_GAUSS, ///< 2-D Twisted Gaussian
     
    6767{
    6868    psModelType type;       ///< Model to be used.
    69     psS32 Nparams;          ///< Number of parameters.
    70     psF32 *params;          ///< Paramater values.
    71     psF32 *dparams;         ///< Parameter errors.
     69    psVector *params;       ///< Paramater values.
     70    psVector *dparams;      ///< Parameter errors.
    7271    psF32 chisq;            ///< Fit chi-squared.
     72    psS32 nDOF;             ///< number of degrees of freedom
     73    psS32 nIter;            ///< number of iterations to reach min
    7374}
    7475psModel;
     
    121122value) of all peaks.
    122123 *****************************************************************************/
    123 psList *pmFindImagePeaks(const psImage *image, ///< The input image where peaks will be found (psF32)
    124                          psF32 threshold ///< Threshold above which to find a peak
    125                         );
     124psArray *pmFindImagePeaks(const psImage *image, ///< The input image where peaks will be found (psF32)
     125                          psF32 threshold ///< Threshold above which to find a peak
     126                         );
    126127
    127128/******************************************************************************
     
    209210/******************************************************************************
    210211XXX: Why only *x argument?
    211  *****************************************************************************/
    212 psF32 pmMinLM_Gauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
     212XXX EAM: psMinimizeLMChi2Func returns psF64, not psF32
     213 *****************************************************************************/
     214psF64 pmMinLM_Gauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
    213215                      psVector *params,  ///< A psVector which holds the parameters of this function
    214216                      psVector *x  ///< A psVector which holds the row/col coordinate
     
    218220XXX: Why only *x argument?
    219221 *****************************************************************************/
    220 psF32 pmMinLM_PsuedoGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
     222psF64 pmMinLM_PsuedoGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
    221223                            psVector *params, ///< A psVector which holds the parameters of this function
    222224                            psVector *x  ///< A psVector which holds the row/col coordinate
     
    225227/******************************************************************************
    226228 *****************************************************************************/
    227 psF32 pmMinLM_Wauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
     229psF64 pmMinLM_Wauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
    228230                      psVector *params,  ///< A psVector which holds the parameters of this function
    229231                      psVector *x  ///< A psVector which holds the row/col coordinate
     
    232234/******************************************************************************
    233235 *****************************************************************************/
    234 psF32 pmMinLM_TwistGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
     236psF64 pmMinLM_TwistGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
    235237                           psVector *params, ///< A psVector which holds the parameters of this function
    236238                           psVector *x  ///< A psVector which holds the row/col coordinate
     
    239241/******************************************************************************
    240242 *****************************************************************************/
    241 psF32 pmMinLM_Sersic(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
     243psF64 pmMinLM_Sersic(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
    242244                     psVector *params,  ///< A psVector which holds the parameters of this function
    243245                     psVector *x  ///< A psVector which holds the row/col coordinate
     
    246248/******************************************************************************
    247249 *****************************************************************************/
    248 psF32 pmMinLM_SersicCore(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
     250psF64 pmMinLM_SersicCore(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
    249251                         psVector *params, ///< A psVector which holds the parameters of this function
    250252                         psVector *x  ///< A psVector which holds the row/col coordinate
     
    253255/******************************************************************************
    254256 *****************************************************************************/
    255 psF32 pmMinLM_PsuedoSersic(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
     257psF64 pmMinLM_PsuedoSersic(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
    256258                           psVector *params, ///< A psVector which holds the parameters of this function
    257259                           psVector *x  ///< A psVector which holds the row/col coordinate
Note: See TracChangeset for help on using the changeset viewer.