IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 6, 2004, 2:32:53 PM (22 years ago)
Author:
gusciora
Message:

Lots of bug fixes and such.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/math/psSpline.c

    r845 r889  
    66 *  @author George Gusciora, MHPCC
    77 *
    8  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-06-04 01:03:11 $
     8 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-06-07 00:32:53 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171 routines for generating both uniformly distributed numbers and the
    7272 Gaussian distribution as well.
     73 
     74 GUS: There is no way to seed the random generator.
    7375 *****************************************************************************/
    7476psVector *psGaussianDev(float mean,
    … …  
    8284
    8385    gauss = psVectorAlloc(Npts, PS_TYPE_F32);
     86    gauss->n = Npts;
    8487    gsl_rng_env_setup();
    8588    T = gsl_rng_default;
    … …  
    120123    newPoly->nY = nY;
    121124
    122     newPoly->coeff    = (float **) psAlloc(nX * sizeof(float));
    123     newPoly->coeffErr = (float **) psAlloc(nX * sizeof(float));
    124     newPoly->mask     = (char **)  psAlloc(nX * sizeof(char));
     125    newPoly->coeff    = (float **) psAlloc(nX * sizeof(float *));
     126    newPoly->coeffErr = (float **) psAlloc(nX * sizeof(float *));
     127    newPoly->mask     = (char **)  psAlloc(nX * sizeof(char *));
    125128    for (x=0;x<nX;x++) {
    126129        newPoly->coeff[x]    = (float *) psAlloc(nY * sizeof(float));
    … …  
    129132    }
    130133
     134
    131135    return(newPoly);
    132136}
    … …  
    143147    newPoly->nZ = nZ;
    144148
    145     newPoly->coeff    = (float ***) psAlloc(nX * sizeof(float));
    146     newPoly->coeffErr = (float ***) psAlloc(nX * sizeof(float));
    147     newPoly->mask     = (char ***)  psAlloc(nX * sizeof(char));
     149    newPoly->coeff    = (float ***) psAlloc(nX * sizeof(float **));
     150    newPoly->coeffErr = (float ***) psAlloc(nX * sizeof(float **));
     151    newPoly->mask     = (char ***)  psAlloc(nX * sizeof(char **));
    148152    for (x=0;x<nX;x++) {
    149         newPoly->coeff[x]    = (float **) psAlloc(nY * sizeof(float));
    150         newPoly->coeffErr[x] = (float **) psAlloc(nY * sizeof(float));
    151         newPoly->mask[x]     = (char **)  psAlloc(nY * sizeof(char));
     153        newPoly->coeff[x]    = (float **) psAlloc(nY * sizeof(float *));
     154        newPoly->coeffErr[x] = (float **) psAlloc(nY * sizeof(float *));
     155        newPoly->mask[x]     = (char **)  psAlloc(nY * sizeof(char *));
    152156        for (y=0;y<nY;y++) {
    153157            newPoly->coeff[x][y]    = (float *) psAlloc(nZ * sizeof(float));
    … …  
    173177    newPoly->nZ = nZ;
    174178
    175     newPoly->coeff    = (float ****) psAlloc(nW * sizeof(float));
    176     newPoly->coeffErr = (float ****) psAlloc(nW * sizeof(float));
    177     newPoly->mask     = (char ****)  psAlloc(nW * sizeof(char));
     179    newPoly->coeff    = (float ****) psAlloc(nW * sizeof(float ***));
     180    newPoly->coeffErr = (float ****) psAlloc(nW * sizeof(float ***));
     181    newPoly->mask     = (char ****)  psAlloc(nW * sizeof(char ***));
    178182    for (w=0;w<nW;w++) {
    179         newPoly->coeff[w]    = (float ***) psAlloc(nX * sizeof(float));
    180         newPoly->coeffErr[w] = (float ***) psAlloc(nX * sizeof(float));
    181         newPoly->mask[w]     = (char ***)  psAlloc(nX * sizeof(char));
     183        newPoly->coeff[w]    = (float ***) psAlloc(nX * sizeof(float **));
     184        newPoly->coeffErr[w] = (float ***) psAlloc(nX * sizeof(float **));
     185        newPoly->mask[w]     = (char ***)  psAlloc(nX * sizeof(char **));
    182186        for (x=0;x<nX;x++) {
    183             newPoly->coeff[w][x]    = (float **) psAlloc(nY * sizeof(float));
    184             newPoly->coeffErr[w][x] = (float **) psAlloc(nY * sizeof(float));
    185             newPoly->mask[w][x]     = (char **) psAlloc(nY * sizeof(char));
     187            newPoly->coeff[w][x]    = (float **) psAlloc(nY * sizeof(float *));
     188            newPoly->coeffErr[w][x] = (float **) psAlloc(nY * sizeof(float *));
     189            newPoly->mask[w][x]     = (char **) psAlloc(nY * sizeof(char *));
    186190            for (y=0;y<nY;y++) {
    187191                newPoly->coeff[w][x][y]    = (float *) psAlloc(nZ * sizeof(float));
    … …  
    410414    newPoly->nY = nY;
    411415
    412     newPoly->coeff    = (double **) psAlloc(nX * sizeof(double));
    413     newPoly->coeffErr = (double **) psAlloc(nX * sizeof(double));
    414     newPoly->mask     = (char **)  psAlloc(nX * sizeof(char));
     416    newPoly->coeff    = (double **) psAlloc(nX * sizeof(double *));
     417    newPoly->coeffErr = (double **) psAlloc(nX * sizeof(double *));
     418    newPoly->mask     = (char **)  psAlloc(nX * sizeof(char *));
    415419    for (x=0;x<nX;x++) {
    416420        newPoly->coeff[x]    = (double *) psAlloc(nY * sizeof(double));
    … …  
    433437    newPoly->nZ = nZ;
    434438
    435     newPoly->coeff    = (double ***) psAlloc(nX * sizeof(double));
    436     newPoly->coeffErr = (double ***) psAlloc(nX * sizeof(double));
    437     newPoly->mask     = (char ***)  psAlloc(nX * sizeof(char));
     439    newPoly->coeff    = (double ***) psAlloc(nX * sizeof(double **));
     440    newPoly->coeffErr = (double ***) psAlloc(nX * sizeof(double **));
     441    newPoly->mask     = (char ***)  psAlloc(nX * sizeof(char **));
    438442    for (x=0;x<nX;x++) {
    439         newPoly->coeff[x]    = (double **) psAlloc(nY * sizeof(double));
    440         newPoly->coeffErr[x] = (double **) psAlloc(nY * sizeof(double));
    441         newPoly->mask[x]     = (char **)  psAlloc(nY * sizeof(char));
     443        newPoly->coeff[x]    = (double **) psAlloc(nY * sizeof(double *));
     444        newPoly->coeffErr[x] = (double **) psAlloc(nY * sizeof(double *));
     445        newPoly->mask[x]     = (char **)  psAlloc(nY * sizeof(char *));
    442446        for (y=0;y<nY;y++) {
    443447            newPoly->coeff[x][y]    = (double *) psAlloc(nZ * sizeof(double));
    … …  
    463467    newPoly->nZ = nZ;
    464468
    465     newPoly->coeff    = (double ****) psAlloc(nW * sizeof(double));
    466     newPoly->coeffErr = (double ****) psAlloc(nW * sizeof(double));
    467     newPoly->mask     = (char ****)  psAlloc(nW * sizeof(char));
     469    newPoly->coeff    = (double ****) psAlloc(nW * sizeof(double ***));
     470    newPoly->coeffErr = (double ****) psAlloc(nW * sizeof(double ***));
     471    newPoly->mask     = (char ****)  psAlloc(nW * sizeof(char ***));
    468472    for (w=0;w<nW;w++) {
    469         newPoly->coeff[w]    = (double ***) psAlloc(nX * sizeof(double));
    470         newPoly->coeffErr[w] = (double ***) psAlloc(nX * sizeof(double));
    471         newPoly->mask[w]     = (char ***)  psAlloc(nX * sizeof(char));
     473        newPoly->coeff[w]    = (double ***) psAlloc(nX * sizeof(double **));
     474        newPoly->coeffErr[w] = (double ***) psAlloc(nX * sizeof(double **));
     475        newPoly->mask[w]     = (char ***)  psAlloc(nX * sizeof(char **));
    472476        for (x=0;x<nX;x++) {
    473             newPoly->coeff[w][x]    = (double **) psAlloc(nY * sizeof(double));
    474             newPoly->coeffErr[w][x] = (double **) psAlloc(nY * sizeof(double));
    475             newPoly->mask[w][x]     = (char **) psAlloc(nY * sizeof(char));
     477            newPoly->coeff[w][x]    = (double **) psAlloc(nY * sizeof(double *));
     478            newPoly->coeffErr[w][x] = (double **) psAlloc(nY * sizeof(double *));
     479            newPoly->mask[w][x]     = (char **) psAlloc(nY * sizeof(char *));
    476480            for (y=0;y<nY;y++) {
    477481                newPoly->coeff[w][x][y]    = (double *) psAlloc(nZ * sizeof(double));
Note: See TracChangeset for help on using the changeset viewer.