IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5134


Ignore:
Timestamp:
Sep 26, 2005, 9:49:41 AM (21 years ago)
Author:
eugene
Message:

mods to keep up-to-date with psLib changes

Location:
trunk/psphot/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/pmObjects_EAM.c

    r5122 r5134  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-09-26 07:17:19 $
     8 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-09-26 19:49:41 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    615615    // XXX EAM : psRegionXXX funcs should take value not ptr
    616616    srcRegion = psRegionForSquare (peak->x, peak->y, Radius);
    617     srcRegion = psRegionForImage (mask, &srcRegion);
    618 
    619     psImageMaskRegion (mask, &srcRegion, "OR", PSPHOT_MASK_MARKED);
     617    srcRegion = psRegionForImage (mask, srcRegion);
     618
     619    psImageMaskRegion (mask, srcRegion, "OR", PSPHOT_MASK_MARKED);
    620620    psStats *myStats = psStatsAlloc(statsOptions);
    621621    myStats = psImageStats(myStats, image, mask, 0xff);
    622     psImageMaskRegion (mask, &srcRegion, "AND", ~PSPHOT_MASK_MARKED);
     622    psImageMaskRegion (mask, srcRegion, "AND", ~PSPHOT_MASK_MARKED);
    623623
    624624    psF64 tmpF64;

  • trunk/psphot/src/pmPSFtry.c

    r5127 r5134  
    204204  // build binned versions of rflux, metric
    205205  dBin = (stats->max - stats->min) / 10.0;
    206   psVector *rfBin = psVectorCreate (stats->min, stats->max, dBin, PS_TYPE_F64);
     206  psVector *rfBin = psVectorCreate (NULL, stats->min, stats->max, dBin, PS_TYPE_F64);
    207207  psVector *daBin = psVectorAlloc (rfBin->n, PS_TYPE_F64);
    208208  psVector *maskB = psVectorAlloc (rfBin->n, PS_TYPE_U8);

  • trunk/psphot/src/psLibUtils.c

    r5048 r5134  
    88// XXX EAM : these utility functions should be added back into PSLib
    99
     10# if (0) // now in psLib (v8)
    1011static psHash *timers = NULL;
    11 
    12 bool psTimerClear (char *name) {
    13 
    14   bool status;
    15 
    16   if (name == NULL) return false;
    17 
    18   status = psHashRemove (timers, name);
    19   return (status);
    20 }
    21 
    22 void psTimerFree () {
    23 
    24   psFree (timers);
    25   p_psTimeFinalize();
    26   return;
    27 }
    2812
    2913// start/restart a named timer
    … …  
    4024}
    4125
     26bool psTimerClear (char *name) {
     27
     28  bool status;
     29
     30  if (name == NULL) return false;
     31
     32  status = psHashRemove (timers, name);
     33  return (status);
     34}
     35
    4236// get current elapsed time on named timer
    4337psF64 psTimerMark (char *name) {
    … …  
    6054}
    6155
     56void psTimerFree () {
     57
     58  psFree (timers);
     59  p_psTimeFinalize();
     60  return;
     61}
     62# endif
     63
     64# if (0)
    6265// find the location of the specified argument
    6366int psArgumentGet (int argc, char **argv, char *arg) {
    … …  
    8790    return (N);
    8891}
     92# endif
    8993
    9094// we have log levels 1 (Error), 2 (Warning), 3 (Info), 4 (Details), 5 (Minutiae)
    … …  
    276280}           
    277281
     282# if (0)
     283// now in psLib (v8)
    278284// count number of pixels with given mask value
    279285int psImageCountPixelMask (psImage *mask, psU8 value)
    … …  
    290296    return (Npixels);
    291297}
     298# endif
    292299
    293300// define a square region centered on the given coordinate
    … …  
    438445# endif
    439446
     447# if (0)
    440448psVector *psVectorCreate (double lower, double upper, double delta, psElemType type) {
    441449
    … …  
    450458  return (out);
    451459}
     460# endif
    452461
    453462// XXX EAM a utility function

  • trunk/psphot/src/psLibUtils.h

    r5068 r5134  
    3030
    3131// psLib extra utilities
     32# if (0) // added to psLib v8
     33int          psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
     34int          psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
     35bool         psTimerClear (char *name);   // added to SDRS
     36int          psImageCountPixelMask (psImage *mask, psU8 value); // added to SDRS
     37psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
     38# endif
     39
    3240bool         psTimerStart (char *name);   // added to SDRS
    33 bool         psTimerClear (char *name);   // added to SDRS
    3441psF64        psTimerMark (char *name);    // added to SDRS
    3542void         psTimerFree ();              // added to SDRS (as psTimerStop)
    3643psS32        psLogArguments (int *argc, char **argv);   // added to SDRS (part of psArgumentVerbosity)
    3744psS32        psTraceArguments (int *argc, char **argv); // added to SDRS (part of psArgumentVerbosity)
    38 int          psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
    39 int          psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
    40 psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
    41 // psVector    *psGetRowVectorFromImage(psImage *image, psU32 row); // added to SDRS (as psImageRow)
    42 int          psImageCountPixelMask (psImage *mask, psU8 value); // added to SDRS
    4345
    4446// basic image functions

  • trunk/psphot/src/psPolynomials.c

    r5084 r5134  
    1212void Polynomial1DDump_EAM (psPolynomial1D *poly) {
    1313
    14     for (int i = 0; i < poly->n + 1; i++) {
     14    for (int i = 0; i < poly->COOL_1D_n + 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->n = nOrder;
     41    newPoly->COOL_1D_n = 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->n + 1; loop_x++) {
     60    for (loop_x = 0; loop_x < myPoly->COOL_1D_n + 1; loop_x++) {
    6161        if (myPoly->mask[loop_x] == 0) {
    6262            polySum += xSum * myPoly->coeff[loop_x];
    … …  
    141141# endif
    142142     
    143     nTerm = myPoly->n + 1;
     143    nTerm = myPoly->COOL_1D_n + 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->nX + 1; i++) {
     225    for (int i = 0; i < poly->COOL_2D_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->nX = nXorder;
    254     newPoly->nY = nYorder;
     253    newPoly->COOL_2D_nX = nXorder;
     254    newPoly->COOL_2D_nY = nYorder;
    255255
    256256    newPoly->coeff = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
    257257    newPoly->coeffErr = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
    258     newPoly->mask = (char **)psAlloc(nXterm * sizeof(char *));
     258    newPoly->mask = (psMaskType **)psAlloc(nXterm * sizeof(psMaskType *));
    259259    // XXX EAM : this is an error in the definition of the polynomial mask
    260260    //           (should be psU8 not char)
    … …  
    278278void Polynomial2DDump_EAM (psPolynomial2D *poly) {
    279279
    280     for (int i = 0; i < poly->nX + 1; i++) {
    281         for (int j = 0; j < poly->nY + 1; j++) {
     280    for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
     281        for (int j = 0; j < poly->COOL_2D_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->nX + 1; loop_x++) {
     300    for (loop_x = 0; loop_x < myPoly->COOL_2D_nX + 1; loop_x++) {
    301301        ySum = xSum;
    302302        // XXX EAM : nX is order, not nTerms
    303         for (loop_y = 0; loop_y < myPoly->nY + 1; loop_y++) {
     303        for (loop_y = 0; loop_y < myPoly->COOL_2D_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->nX + 1;
    428     nYterm = myPoly->nY + 1;
     427    nXterm = myPoly->COOL_2D_nX + 1;
     428    nYterm = myPoly->COOL_2D_nY + 1;
    429429    nTerm = nXterm * nYterm;
    430430

  • trunk/psphot/src/psphotDefinePixels.c

    r5049 r5134  
    1111    // Grab a subimage of the original image of size (2 * outerRadius).
    1212    srcRegion = psRegionForSquare (x, y, Radius);
    13     srcRegion = psRegionForImage (imdata->image, &srcRegion);
     13    srcRegion = psRegionForImage (imdata->image, srcRegion);
    1414
    1515    mySource->pixels = psImageSubset(imdata->image, srcRegion);

  • trunk/psphot/src/psphotSetup.c

    r5058 r5134  
    7777    float YMAX  = psMetadataLookupF32 (&status, config, "YMAX");
    7878    psRegion keep = psRegionSet (XMIN, XMAX, YMIN, YMAX);
    79     keep = psRegionForImage (image, &keep);
    80     psImageKeepRegion (mask, &keep, "OR", PSPHOT_MASK_INVALID);
    81     // XXX EAM : psRegionForImage should not take psRegion *keep
     79    keep = psRegionForImage (image, keep);
     80    psImageKeepRegion (mask, keep, "OR", PSPHOT_MASK_INVALID);
    8281
    8382    // mask the saturated pixels
Note: See TracChangeset for help on using the changeset viewer.