IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6325 for trunk/psModules/src


Ignore:
Timestamp:
Feb 6, 2006, 11:03:25 AM (21 years ago)
Author:
gusciora
Message:

These changes mostly reflect the new psStats SDRS changes.

However, pmObject.c will fail any real test because the call
to psMinimizeLMM() was commented out due to SDRS changes there.

Location:
trunk/psModules/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/config/pmConfig.c

    r6297 r6325  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-02-02 04:51:14 $
     5 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-02-06 21:03:23 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    449449    }
    450450
    451     dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
     451
     452
     453    psDB *dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
    452454    psFree(dbServer);
    453455    psFree(dbUsername);

  • trunk/psModules/src/imcombine/pmReadoutCombine.c

    r6206 r6325  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-01-26 21:19:25 $
     7 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-02-06 21:03:25 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    410410    psRegion minRegion;
    411411    psRegion maxRegion;
    412     psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
    413     psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
     412    psStats *minStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
     413    psStats *maxStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
    414414    psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
    415415    psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
    … …  
    445445        }
    446446
    447         fp->midValue = 0.5 * (maxStats->robustMean + minStats->robustMean);
    448         fp->delta = maxStats->robustMean - minStats->robustMean;
     447        fp->midValue = 0.5 * (maxStats->fittedMean + minStats->fittedMean);
     448        fp->delta = maxStats->fittedMean - minStats->fittedMean;
    449449        diffs->data.F32[i] = fp->delta;
    450450    }
    … …  
    455455    psFree(diffs);
    456456    if (diffStats == NULL) {
    457         psError(PS_ERR_UNKNOWN, true, "Could not determine robust median of the differences.\n");
     457        psError(PS_ERR_UNKNOWN, true, "Could not determine fitted median of the differences.\n");
    458458        return(NULL);
    459459    }

  • trunk/psModules/src/imsubtract/pmSubtractBias.c

    r6205 r6325  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-01-26 21:10:51 $
     8 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-02-06 21:03:25 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    179179    psStatsOptions opt = 0;
    180180
    181     if (stat->options & PS_STAT_ROBUST_MODE) {
    182         if (numOptions == 0) {
    183             opt = PS_STAT_ROBUST_MODE;
    184         }
    185         numOptions++;
    186     }
    187 
     181    /*
     182        if (stat->options & PS_STAT_ROBUST_MODE) {
     183            if (numOptions == 0) {
     184                opt = PS_STAT_ROBUST_MODE;
     185            }
     186            numOptions++;
     187        }
     188    */
    188189    if (stat->options & PS_STAT_ROBUST_MEDIAN) {
    189190        if (numOptions == 0) {
    … …  
    193194    }
    194195
    195     if (stat->options & PS_STAT_ROBUST_MEAN) {
     196    if (stat->options & PS_STAT_FITTED_MEAN) {
    196197        if (numOptions == 0) {
    197             opt = PS_STAT_ROBUST_MEAN;
     198            opt = PS_STAT_FITTED_MEAN;
    198199        }
    199200        numOptions++;

  • trunk/psModules/src/imsubtract/pmSubtractSky.c

    r5516 r6325  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-11-15 20:09:03 $
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-02-06 21:03:25 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    } else if (statOptions & PS_STAT_CLIPPED_MEAN) {
    6868        return(PS_STAT_CLIPPED_MEAN);
    69     } else if (statOptions & PS_STAT_ROBUST_MEAN) {
    70         return(PS_STAT_ROBUST_MEAN);
     69    } else if (statOptions & PS_STAT_FITTED_MEAN) {
     70        return(PS_STAT_FITTED_MEAN);
    7171    } else if (statOptions & PS_STAT_ROBUST_MEDIAN) {
    7272        return(PS_STAT_ROBUST_MEDIAN);
    73     } else if (statOptions & PS_STAT_ROBUST_MODE) {
    74         return(PS_STAT_ROBUST_MODE);
    7573    }
    7674    psError(PS_ERR_UNKNOWN, true, "Unallowable option requested for statistically binning image pixels.\n");
    7775    return(-1);
     76    // XXX
     77    //else if (statOptions & PS_STAT_ROBUST_MODE) {
     78    //    return(PS_STAT_ROBUST_MODE);
     79    //}
    7880}
    7981

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

    r6206 r6325  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-01-26 21:19:25 $
     8 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-02-06 21:03:25 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    16531653
    16541654    psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
    1655     fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
     1655
     1656    /* XXXX: Must change this:
     1657        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y,
     1658                                     yErr, modelFunc);
     1659    */
    16561660    for (int i = 0; i < dparams->n; i++) {
    16571661        if ((paramMask != NULL) && paramMask->data.U8[i])
    … …  
    18191823
    18201824    psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
    1821     fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
     1825    /* XXXX: Must change this:
     1826        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
     1827    */
    18221828    for (int i = 0; i < dparams->n; i++) {
    18231829        if ((paramMask != NULL) && paramMask->data.U8[i])
Note: See TracChangeset for help on using the changeset viewer.