IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9528 for trunk/psModules


Ignore:
Timestamp:
Oct 12, 2006, 4:29:14 PM (20 years ago)
Author:
rhl
Message:

Renamed PM_PAR_FLUX to PM_PAR_I0

Location:
trunk/psModules/src/objects
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/objects/models/pmModel_QGAUSS.c

    r9526 r9528  
    55 
    66    params->data.F32[PM_PAR_SKY] = So;
    7     params->data.F32[PM_PAR_FLUX] = Zo;
     7    params->data.F32[PM_PAR_I0] = Zo;
    88    params->data.F32[PM_PAR_XPOS] = Xo;
    99    params->data.F32[PM_PAR_YPOS] = Yo;
    … …  
    3232    psF32 r  = 1.0 / (1 + PAR[PM_PAR_7]*z + z*zp);
    3333
    34     psF32 r1 = PAR[PM_PAR_FLUX]*r;
     34    psF32 r1 = PAR[PM_PAR_I0]*r;
    3535    psF32 f  = r1 + PAR[PM_PAR_SKY];
    3636
    … …  
    3838        psF32 *dPAR = deriv->data.F32;
    3939
    40         // note difference from a pure gaussian: q = params->data.F32[PM_PAR_FLUX]*r
     40        // note difference from a pure gaussian: q = params->data.F32[PM_PAR_I0]*r
    4141        psF32 t = r1*r;
    4242        psF32 q = t*(PAR[PM_PAR_7] + 2.25*zp);
    4343
    4444        dPAR[PM_PAR_SKY] = +1.0;
    45         dPAR[PM_PAR_FLUX] = +r;
     45        dPAR[PM_PAR_I0] = +r;
    4646        dPAR[PM_PAR_XPOS] = q*(2.0*px*PAR[PM_PAR_SXX] + PAR[PM_PAR_SXY]*Y);
    4747        dPAR[PM_PAR_YPOS] = q*(2.0*py*PAR[PM_PAR_SYY] + PAR[PM_PAR_SXY]*X);
    … …  
    6565
    6666    beta_lim[0][0].data.F32[PM_PAR_SKY] = 1000;
    67     beta_lim[0][0].data.F32[PM_PAR_FLUX] = 3e6;
     67    beta_lim[0][0].data.F32[PM_PAR_I0] = 3e6;
    6868    beta_lim[0][0].data.F32[PM_PAR_XPOS] = 5;
    6969    beta_lim[0][0].data.F32[PM_PAR_YPOS] = 5;
    … …  
    7474
    7575    params_min[0][0].data.F32[PM_PAR_SKY] = -1000;
    76     params_min[0][0].data.F32[PM_PAR_FLUX] = 0;
     76    params_min[0][0].data.F32[PM_PAR_I0] = 0;
    7777    params_min[0][0].data.F32[PM_PAR_XPOS] = -100;
    7878    params_min[0][0].data.F32[PM_PAR_YPOS] = -100;
    … …  
    8383
    8484    params_max[0][0].data.F32[PM_PAR_SKY] = 1e5;
    85     params_max[0][0].data.F32[PM_PAR_FLUX] = 1e8;
     85    params_max[0][0].data.F32[PM_PAR_I0] = 1e8;
    8686    params_max[0][0].data.F32[PM_PAR_XPOS] = 1e4;  // this should be set by image dimensions!
    8787    params_max[0][0].data.F32[PM_PAR_YPOS] = 1e4;  // this should be set by image dimensions!
    … …  
    103103
    104104    params[PM_PAR_SKY] = moments->Sky;
    105     params[PM_PAR_FLUX] = moments->Peak - moments->Sky;
     105    params[PM_PAR_I0] = moments->Peak - moments->Sky;
    106106    params[PM_PAR_XPOS] = peak->x;
    107107    params[PM_PAR_YPOS] = peak->y;
    … …  
    143143    norm *= DZ / 3.0;
    144144
    145     psF64 Flux = PAR[PM_PAR_FLUX] * Area * norm;
     145    psF64 Flux = PAR[PM_PAR_I0] * Area * norm;
    146146
    147147    return(Flux);
    … …  
    158158    if (flux <= 0)
    159159        return (1.0);
    160     if (PAR[PM_PAR_FLUX] <= 0)
     160    if (PAR[PM_PAR_I0] <= 0)
    161161        return (1.0);
    162     if (flux >= PAR[PM_PAR_FLUX])
     162    if (flux >= PAR[PM_PAR_I0])
    163163        return (1.0);
    164164
    165165    // if Sx == Sy, sigma = Sx == Sy
    166166    psF64 sigma = hypot (1.0 / PAR[PM_PAR_SXX], 1.0 / PAR[PM_PAR_SYY]) / sqrt(2.0);
    167     psF64 limit = flux / PAR[PM_PAR_FLUX];
     167    psF64 limit = flux / PAR[PM_PAR_I0];
    168168
    169169    # if 0
    … …  
    225225
    226226    out[PM_PAR_SKY] = in[PM_PAR_SKY];
    227     out[PM_PAR_FLUX] = in[PM_PAR_FLUX];
     227    out[PM_PAR_I0] = in[PM_PAR_I0];
    228228    out[PM_PAR_XPOS] = in[PM_PAR_XPOS];
    229229    out[PM_PAR_YPOS] = in[PM_PAR_YPOS];
    … …  
    255255    status = true;
    256256    status &= (dP < 0.5);
    257     status &= (PAR[PM_PAR_FLUX] > 0);
    258     status &= ((dPAR[PM_PAR_FLUX]/PAR[PM_PAR_FLUX]) < 0.5);
     257    status &= (PAR[PM_PAR_I0] > 0);
     258    status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
    259259
    260260    if (!status)

  • trunk/psModules/src/objects/pmModel.h

    r8882 r9528  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-09-22 12:24:38 $
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-10-13 02:29:14 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454 * may/will correspond to different parameters in different contexts
    5555 */
    56 #define PM_PAR_SKY 0   // Sky
    57 #define PM_PAR_FLUX 1   // Flux
    58 #define PM_PAR_XPOS 2   // X centre of object
    59 #define PM_PAR_YPOS 3   // Y centre of object
    60 #define PM_PAR_SXX 4   // shape X^2 moment
    61 #define PM_PAR_SYY 5   // shape Y^2 moment
    62 #define PM_PAR_SXY 6   // shape XY moment
    63 #define PM_PAR_7 7   // ??? Unknown parameter
    64 #define PM_PAR_8 8   // ??? Unknown parameter
     56#define PM_PAR_SKY 0   ///< Sky
     57#define PM_PAR_I0 1   ///< Central intensity
     58#define PM_PAR_XPOS 2   ///< X centre of object
     59#define PM_PAR_YPOS 3   ///< Y centre of object
     60#define PM_PAR_SXX 4   ///< shape X^2 moment
     61#define PM_PAR_SYY 5   ///< shape Y^2 moment
     62#define PM_PAR_SXY 6   ///< shape XY moment
     63#define PM_PAR_7 7   ///< ??? Unknown parameter
     64#define PM_PAR_8 8   ///< ??? Unknown parameter
    6565
    6666/** pmModelAlloc()

  • trunk/psModules/src/objects/pmPSFtry.c

    r9316 r9528  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-10-05 23:40:52 $
     7 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-10-13 02:29:14 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    191191    psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
    192192
    193     // measure the chi-square trend as a function of flux (PAR[PM_PAR_FLUX])
     193    // measure the chi-square trend as a function of flux (PAR[PM_PAR_I0])
    194194    // this should be linear for Poisson errors and quadratic for constant sky errors
    195195    psVector *flux  = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
    … …  
    206206            mask->data.U8[i] = 1;
    207207        } else {
    208             flux->data.F64[i] = model->params->data.F32[PM_PAR_FLUX];
     208            flux->data.F64[i] = model->params->data.F32[PM_PAR_I0];
    209209            chisq->data.F64[i] = model[0].chisq/model[0].nDOF;
    210210            mask->data.U8[i] = 0;

  • trunk/psModules/src/objects/pmSourceFitModel.c

    r9526 r9528  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-10-13 02:23:55 $
     8 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-10-13 02:29:14 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    136136        // NORM-only model fits only source normalization (Io)
    137137        nParams = 1;
    138         paramMask->data.U8[PM_PAR_FLUX] = 0;
     138        paramMask->data.U8[PM_PAR_I0] = 0;
    139139        break;
    140140    case PM_SOURCE_FIT_PSF:
    141141        // PSF model only fits x,y,Io
    142142        nParams = 3;
    143         paramMask->data.U8[PM_PAR_FLUX] = 0;
     143        paramMask->data.U8[PM_PAR_I0] = 0;
    144144        paramMask->data.U8[PM_PAR_XPOS] = 0;
    145145        paramMask->data.U8[PM_PAR_YPOS] = 0;

  • trunk/psModules/src/objects/pmSourceIO_OBJ.c

    r8882 r9528  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-09-22 12:24:38 $
     5 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-10-13 02:29:14 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6262        dPAR = model->dparams->data.F32;
    6363
    64         dmag = dPAR[PM_PAR_FLUX] / PAR[PM_PAR_FLUX];
     64        dmag = dPAR[PM_PAR_I0] / PAR[PM_PAR_I0];
    6565        type = pmSourceDophotType (source);
    6666        if ((source->apMag < 99.0) && (source->psfMag < 99.0)) {

  • trunk/psModules/src/objects/pmSourcePhotometry.c

    r9527 r9528  
    33 *  @author EAM, IfA; GLG, MHPCC
    44 *
    5  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-10-13 02:24:34 $
     5 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-10-13 02:29:14 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9595    }
    9696
    97     if (model->dparams->data.F32[PM_PAR_FLUX] > 0) {
    98         SN = model->params->data.F32[PM_PAR_FLUX] / model->dparams->data.F32[PM_PAR_FLUX];
     97    if (model->dparams->data.F32[PM_PAR_I0] > 0) {
     98        SN = model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0];
    9999        source->errMag = 1.0 / SN;
    100100    } else {
Note: See TracChangeset for help on using the changeset viewer.