IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5350


Ignore:
Timestamp:
Oct 17, 2005, 8:07:54 AM (21 years ago)
Author:
eugene
Message:

changes to sync with v0.8.0: PS_META_* to PS_DATA_*, etc

Location:
trunk/psphot/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/pmObjects_EAM.c

    r5134 r5350  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-09-26 19:49:41 $
     8 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-10-17 18:07:54 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    999999    int Ncr      = 0;
    10001000    int Nsatstar = 0;
     1001    psRegion allArray = {0, 0, 0, 0};
    10011002
    10021003    psVector *starsn = psVectorAlloc (sources->n, PS_TYPE_F32);
    … …  
    10301031
    10311032        // XXX EAM : can we use the value of SATURATE if mask is NULL?
    1032         int Nsatpix = psImageCountPixelMask (tmpSrc->mask, PSPHOT_MASK_SATURATED);
     1033        int Nsatpix = psImageCountPixelMask (tmpSrc->mask, allArray, PSPHOT_MASK_SATURATED);
    10331034
    10341035        // saturated star (size consistent with PSF or larger)

  • trunk/psphot/src/psMinimize.c

    r5049 r5350  
    44// XXX EAM : this file contains my alternate implementations of psMinimizeLMChi2
    55// XXX EAM this implementation of MinLM includes limits on params & dparams
     6
     7psBool p_psMinLM_GuessABP(
     8                          psImage  *Alpha,
     9                          psVector *Beta,
     10                          psVector *Params,
     11                          const psImage  *alpha,
     12                          const psVector *beta,
     13                          const psVector *params,
     14                          const psVector *paramMask,
     15                          const psVector *beta_lim,
     16                          const psVector *params_min,
     17                          const psVector *params_max,
     18                          psF64 lambda);
    619
    720psBool psMinimizeLMChi2_EAM(psMinimization *min,
    … …  
    275288
    276289    p_psMinLM_SetABX (alpha, beta, params, paramMask, x, y, dy, func);
    277     p_psMinLM_GuessABP (Alpha, delta, Params, alpha, beta, params, paramMask, 0.0);
     290    p_psMinLM_GuessABP (Alpha, delta, Params, alpha, beta, params, paramMask, NULL, NULL, NULL, 0.0);
    278291
    279292    psFree (alpha);

  • trunk/psphot/src/psModulesUtils.c

    r5125 r5350  
    2323
    2424    // I'm either expecting a string, with the name "HD:keyword"...
    25     if (item->type == PS_META_STR) {
     25    if (item->type == PS_DATA_STRING) {
    2626        source = item->data.V;
    2727        if (!strncasecmp (source, "HD:", 3)) {
    … …  
    3838
    3939    //  ... or a value (F32?)
    40     if (item->type == PS_META_F32) {
     40    if (item->type == PS_DATA_F32) {
    4141        value = item->data.F32;
    4242        // psFree (item);

  • trunk/psphot/src/psPolynomials.c

    r5134 r5350  
    1212void Polynomial1DDump_EAM (psPolynomial1D *poly) {
    1313
    14     for (int i = 0; i < poly->COOL_1D_n + 1; i++) {
     14    for (int i = 0; i < poly->nX + 1; i++) {
    1515        fprintf (stderr, "x^%d : %g +/- %g\n", i, poly->coeff[i], poly->coeffErr[i]);
    1616    }
    … …  
    3939    newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
    4040    newPoly->type = type;
    41     newPoly->COOL_1D_n = nOrder;
     41    newPoly->nX = nOrder;
    4242    newPoly->coeff = (psF64 *)psAlloc(nTerm * sizeof(psF64));
    4343    newPoly->coeffErr = (psF64 *)psAlloc(nTerm * sizeof(psF64));
    … …  
    5858    psF64 xSum = 1.0;
    5959
    60     for (loop_x = 0; loop_x < myPoly->COOL_1D_n + 1; loop_x++) {
     60    for (loop_x = 0; loop_x < myPoly->nX + 1; loop_x++) {
    6161        if (myPoly->mask[loop_x] == 0) {
    6262            polySum += xSum * myPoly->coeff[loop_x];
    … …  
    141141# endif
    142142     
    143     nTerm = myPoly->COOL_1D_n + 1;
     143    nTerm = myPoly->nX + 1;
    144144    A     = psImageAlloc(nTerm, nTerm, PS_TYPE_F64);
    145145    B     = psVectorAlloc(nTerm, PS_TYPE_F64);
    … …  
    223223
    224224    if (poly == NULL) return;
    225     for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
     225    for (int i = 0; i < poly->nX + 1; i++) {
    226226        psFree (poly->coeff[i]);
    227227        psFree (poly->coeffErr[i]);
    … …  
    251251    newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
    252252    newPoly->type = type;
    253     newPoly->COOL_2D_nX = nXorder;
    254     newPoly->COOL_2D_nY = nYorder;
     253    newPoly->nX = nXorder;
     254    newPoly->nY = nYorder;
    255255
    256256    newPoly->coeff = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
    … …  
    278278void Polynomial2DDump_EAM (psPolynomial2D *poly) {
    279279
    280     for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
    281         for (int j = 0; j < poly->COOL_2D_nY + 1; j++) {
     280    for (int i = 0; i < poly->nX + 1; i++) {
     281        for (int j = 0; j < poly->nY + 1; j++) {
    282282            fprintf (stderr, "x^%d y^%d : %g +/- %g\n", i, j, poly->coeff[i][j], poly->coeffErr[i][j]);
    283283        }
    … …  
    298298
    299299    // XXX EAM : nX is order, not nTerms
    300     for (loop_x = 0; loop_x < myPoly->COOL_2D_nX + 1; loop_x++) {
     300    for (loop_x = 0; loop_x < myPoly->nX + 1; loop_x++) {
    301301        ySum = xSum;
    302302        // XXX EAM : nX is order, not nTerms
    303         for (loop_y = 0; loop_y < myPoly->COOL_2D_nY + 1; loop_y++) {
     303        for (loop_y = 0; loop_y < myPoly->nY + 1; loop_y++) {
    304304            if (myPoly->mask[loop_x][loop_y] == 0) {
    305305                polySum += ySum * myPoly->coeff[loop_x][loop_y];
    … …  
    425425    psS32 nTerm, nXterm, nYterm;
    426426
    427     nXterm = myPoly->COOL_2D_nX + 1;
    428     nYterm = myPoly->COOL_2D_nY + 1;
     427    nXterm = myPoly->nX + 1;
     428    nYterm = myPoly->nY + 1;
    429429    nTerm = nXterm * nYterm;
    430430

  • trunk/psphot/src/psphotArguments.c

    r5123 r5350  
    66
    77  int N, Nfail;
    8   int mode = PS_META_STR | PS_META_REPLACE;
     8  int mode = PS_DATA_STRING | PS_META_REPLACE;
    99
    1010  // basic pslib options
    … …  
    5050  // load config information
    5151  psMetadata *config = psMetadataAlloc ();
    52   psMetadataAdd (config, PS_LIST_HEAD, "PSF_MODEL", PS_META_MULTI, "folder for psf model entries", NULL);
     52  psMetadataAdd (config, PS_LIST_HEAD, "PSF_MODEL", PS_DATA_METADATA_MULTI, "folder for psf model entries", NULL);
    5353  config = psMetadataConfigParse (config, &Nfail, argv[3], FALSE);
    5454

  • trunk/psphot/src/psphotOutput.c

    r5128 r5350  
    186186
    187187    // write necessary information to output header
    188     psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_META_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
    189     psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_META_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
    190     psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_META_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
    191     psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_META_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
    192     psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_META_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
    193     psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_META_STR | PS_META_REPLACE, "photometry code",     PHOTCODE);
    194     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
    195     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
    196     psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_META_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
    197     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_META_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
    198     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_META_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
     188    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_DATA_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
     189    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_DATA_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
     190    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_DATA_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
     191    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_DATA_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
     192    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_DATA_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
     193    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_DATA_STRING | PS_META_REPLACE, "photometry code",     PHOTCODE);
     194    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
     195    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
     196    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_DATA_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
     197    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_DATA_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
     198    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_DATA_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
    199199
    200200    // create file, write-out header
    … …  
    205205    mdi = psMetadataLookup (imdata->header, "NAXIS");
    206206    mdi->data.S32 = 0;
    207     mdi->type = PS_META_S32;
    208 
    209     // psMetadataAdd (imdata->header, PS_LIST_HEAD, "NAXIS", PS_META_S32 | PS_META_REPLACE, "", 0);
     207    mdi->type = PS_DATA_S32;
     208
     209    // psMetadataAdd (imdata->header, PS_LIST_HEAD, "NAXIS", PS_DATA_S32 | PS_META_REPLACE, "", 0);
    210210    psFitsWriteHeader (imdata->header, fits);
    211211    psFree (fits);
    … …  
    275275
    276276    // write necessary information to output header
    277     psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_META_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
    278     psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_META_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
    279     psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_META_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
    280     psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_META_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
    281     psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_META_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
    282     psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_META_STR | PS_META_REPLACE, "photometry code",     PHOTCODE);
    283     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
    284     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
    285     psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_META_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
    286     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_META_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
    287     psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_META_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
     277    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_DATA_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
     278    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_DATA_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
     279    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_DATA_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
     280    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_DATA_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
     281    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_DATA_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
     282    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_DATA_STRING | PS_META_REPLACE, "photometry code",     PHOTCODE);
     283    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
     284    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
     285    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_DATA_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
     286    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_DATA_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
     287    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_DATA_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
    288288
    289289    // set NAXIS to 0
    … …  
    291291    mdi = psMetadataLookup (imdata->header, "NAXIS");
    292292    mdi->data.S32 = 0;
    293     mdi->type = PS_META_S32;
     293    mdi->type = PS_DATA_S32;
    294294
    295295    table = psArrayAlloc (sources->n);
    … …  
    310310
    311311        row = psMetadataAlloc ();
    312         psMetadataAdd (row, PS_LIST_HEAD, "X_PIX",   PS_META_F32, "", PAR[2]);
    313         psMetadataAdd (row, PS_LIST_HEAD, "Y_PIX",   PS_META_F32, "", PAR[3]);
    314         psMetadataAdd (row, PS_LIST_HEAD, "MAG_RAW", PS_META_F32, "", source->fitMag + ZERO_POINT);
    315         psMetadataAdd (row, PS_LIST_HEAD, "MAG_ERR", PS_META_F32, "", (int)(1000*dmag));
    316         psMetadataAdd (row, PS_LIST_HEAD, "MAG_GAL", PS_META_F32, "", type);
    317         psMetadataAdd (row, PS_LIST_HEAD, "MAG_AP",  PS_META_F32, "", lsky);
    318         psMetadataAdd (row, PS_LIST_HEAD, "LOG_SKY", PS_META_F32, "", 32.0);    // should be 'Mgal'
    319         psMetadataAdd (row, PS_LIST_HEAD, "FWHM_X",  PS_META_F32, "", source->apMag + ZERO_POINT);
    320         psMetadataAdd (row, PS_LIST_HEAD, "FWHM_Y",  PS_META_F32, "", PAR[4]);  // should be 'FHWM x'
    321         psMetadataAdd (row, PS_LIST_HEAD, "THETA",   PS_META_F32, "", PAR[5]);  // should be 'FHWM y'
     312        psMetadataAdd (row, PS_LIST_HEAD, "X_PIX",   PS_DATA_F32, "", PAR[2]);
     313        psMetadataAdd (row, PS_LIST_HEAD, "Y_PIX",   PS_DATA_F32, "", PAR[3]);
     314        psMetadataAdd (row, PS_LIST_HEAD, "MAG_RAW", PS_DATA_F32, "", source->fitMag + ZERO_POINT);
     315        psMetadataAdd (row, PS_LIST_HEAD, "MAG_ERR", PS_DATA_F32, "", (int)(1000*dmag));
     316        psMetadataAdd (row, PS_LIST_HEAD, "MAG_GAL", PS_DATA_F32, "", type);
     317        psMetadataAdd (row, PS_LIST_HEAD, "MAG_AP",  PS_DATA_F32, "", lsky);
     318        psMetadataAdd (row, PS_LIST_HEAD, "LOG_SKY", PS_DATA_F32, "", 32.0);    // should be 'Mgal'
     319        psMetadataAdd (row, PS_LIST_HEAD, "FWHM_X",  PS_DATA_F32, "", source->apMag + ZERO_POINT);
     320        psMetadataAdd (row, PS_LIST_HEAD, "FWHM_Y",  PS_DATA_F32, "", PAR[4]);  // should be 'FHWM x'
     321        psMetadataAdd (row, PS_LIST_HEAD, "THETA",   PS_DATA_F32, "", PAR[5]);  // should be 'FHWM y'
    322322        psMetadataAdd (row, PS_LIST_HEAD, "DOPHOT",  PS_TYPE_S8,  "", 0);   // should be theta
    323         // psMetadataAdd (header, PS_LIST_HEAD, "DUMMY",   PS_META_STR, "", NULL);
     323        // psMetadataAdd (header, PS_LIST_HEAD, "DUMMY",   PS_DATA_STRING, "", NULL);
    324324   
    325325        psArrayAdd (table, 100, row);
    … …  
    334334
    335335    theader = psMetadataAlloc ();
    336     psMetadataAdd (theader, PS_LIST_HEAD, "EXTNAME", PS_META_STR, "extension name", "SMPFILE");
     336    psMetadataAdd (theader, PS_LIST_HEAD, "EXTNAME", PS_DATA_STRING, "extension name", "SMPFILE");
    337337
    338338    unlink (filename);

  • trunk/psphot/src/psphotSetup.c

    r5134 r5350  
    2121    // XXX EAM - shouldn't this be part of the basic FITS concept?
    2222    header = psMetadataAlloc ();
    23     psMetadataAdd (header, PS_LIST_HEAD, "COMMENT", PS_META_MULTI, "folder for comment", NULL);
    24     psMetadataAdd (header, PS_LIST_HEAD, "HISTORY", PS_META_MULTI, "folder for history", NULL);
     23    psMetadataAdd (header, PS_LIST_HEAD, "COMMENT", PS_DATA_METADATA_MULTI, "folder for comment", NULL);
     24    psMetadataAdd (header, PS_LIST_HEAD, "HISTORY", PS_DATA_METADATA_MULTI, "folder for history", NULL);
    2525
    2626    // read header and image data from INPUT
    … …  
    3838    float RDNOISE  = pmConfigLookupF32 (&status, config, header, "RDNOISE");
    3939    float GAIN     = pmConfigLookupF32 (&status, config, header, "GAIN");
    40     psMetadataAdd (config, PS_LIST_TAIL, "RDNOISE", PS_META_F32 | PS_META_REPLACE, "read noise value used", RDNOISE);
    41     psMetadataAdd (config, PS_LIST_TAIL, "GAIN",    PS_META_F32 | PS_META_REPLACE, "gain value used", GAIN);
     40    psMetadataAdd (config, PS_LIST_TAIL, "RDNOISE", PS_DATA_F32 | PS_META_REPLACE, "read noise value used", RDNOISE);
     41    psMetadataAdd (config, PS_LIST_TAIL, "GAIN",    PS_DATA_F32 | PS_META_REPLACE, "gain value used", GAIN);
    4242
    4343    // load the weight image if it is supplied, otherwise build from input
Note: See TracChangeset for help on using the changeset viewer.