IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4286


Ignore:
Timestamp:
Jun 16, 2005, 12:00:04 PM (21 years ago)
Author:
gusciora
Message:

CHeck in, check in often. -- RDD

Location:
trunk/psLib/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psCoord.c

    r4225 r4286  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-13 20:16:22 $
     12*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-16 22:00:03 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    242242    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
    243243    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     244    printf("psPlaneTransformApply(): (%f, %f) x:(%d, %d)\n",
     245           coords->x, coords->y, transform->x->nX, transform->x->nY);
    244246
    245247    if (out == NULL) {
     248        printf("psPlaneTransformApply(): out is NULL\n");
    246249        out = (psPlane* ) psAlloc(sizeof(psPlane));
    247250    }
     251    /*
     252        out->x = psDPolynomial2DEval(
     253                     transform->x,
     254                     coords->x,
     255                     coords->y
     256                 );
     257        out->y = psDPolynomial2DEval(
     258                     transform->y,
     259                     coords->x,
     260                     coords->y
     261                 );
     262    */
    248263    out->x = psDPolynomial2DEval(
    249264                 transform->x,
    … …  
    251266                 coords->y
    252267             );
     268
    253269    out->y = psDPolynomial2DEval(
    254270                 transform->y,
    … …  
    257273             );
    258274
     275    printf("psPlaneTransformApply(END)\n");
    259276    return (out);
    260277}

  • trunk/psLib/src/astronomy/psCoord.c

    r4225 r4286  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-13 20:16:22 $
     12*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-16 22:00:03 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    242242    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
    243243    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     244    printf("psPlaneTransformApply(): (%f, %f) x:(%d, %d)\n",
     245           coords->x, coords->y, transform->x->nX, transform->x->nY);
    244246
    245247    if (out == NULL) {
     248        printf("psPlaneTransformApply(): out is NULL\n");
    246249        out = (psPlane* ) psAlloc(sizeof(psPlane));
    247250    }
     251    /*
     252        out->x = psDPolynomial2DEval(
     253                     transform->x,
     254                     coords->x,
     255                     coords->y
     256                 );
     257        out->y = psDPolynomial2DEval(
     258                     transform->y,
     259                     coords->x,
     260                     coords->y
     261                 );
     262    */
    248263    out->x = psDPolynomial2DEval(
    249264                 transform->x,
    … …  
    251266                 coords->y
    252267             );
     268
    253269    out->y = psDPolynomial2DEval(
    254270                 transform->y,
    … …  
    257273             );
    258274
     275    printf("psPlaneTransformApply(END)\n");
    259276    return (out);
    260277}

  • trunk/psLib/src/dataManip/psFunctions.c

    r4219 r4286  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-13 19:39:31 $
     9 *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-16 22:00:03 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    671671}
    672672
    673 static psF64 dOrdPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly)
     673static psF64 dOrdPolynomial2DEval(psF64 x,
     674                                  psF64 y,
     675                                  const psDPolynomial2D* myPoly)
    674676{
    675677    psS32 loop_x = 0;
    … …  
    678680    psF64 xSum = 1.0;
    679681    psF64 ySum = 1.0;
     682    printf("dOrdPolynomial2DEval(%f, %f) (%d, %d)\n", x, y, myPoly->nX, myPoly->nY);
    680683
    681684    for (loop_x = 0; loop_x < myPoly->nX; loop_x++) {
    … …  
    689692        xSum *= x;
    690693    }
     694    printf("dOrdPolynomial2DEval(END)\n");
    691695
    692696    return(polySum);

  • trunk/psLib/src/image/psImageGeomManip.c

    r4214 r4286  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-11 02:19:05 $
     12 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-16 22:00:04 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    697697                          const psPixels* pixels,
    698698                          psImageInterpolateMode mode,
    699                           int exposedValue)
     699                          int exposedValue,
     700                          psPlaneTransform *junk)
    700701{
     702    printf("junk(A): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     703
     704
    701705    if (input == NULL) {
    702706        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    … …  
    707711    psElemType type = input->type.type;
    708712
     713    printf("junk(B): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    709714    if (inputMask != NULL) {
    710715        if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
    … …  
    733738    }
    734739
     740    printf("junk(C): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    735741    int row0;
    736742    int row1;
    … …  
    774780    }
    775781
     782    printf("junk(D): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    776783    // loop through the output image using the domain above and transform
    777784    // each output pixel to input coordinates and use psImagePixelInterpolate
    … …  
    780787    psPlane* inPosition = NULL;
    781788
     789
     790
     791
     792
    782793    #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    783794    /* apply the transform to get the position in the input image */ \
     795    printf("junk(Ea): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    784796    inPosition = psPlaneTransformApply(inPosition, outToIn, &outPosition); \
    785797    \
     798    printf("junk(Eaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    786799    if (inPosition == NULL) { \
    787800        psError(PS_ERR_UNKNOWN, false, \
    … …  
    791804    } \
    792805    /* interpolate the cooresponding input pixel to get the output pixel value. */ \
     806    printf("junk(Eaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    793807    ps##TYPE value = p_psImagePixelInterpolate##MODE##_##TYPE(input, \
    794808                     inPosition->x, inPosition->y, \
    795809                     inputMask, inputMaskVal, NAN); \
     810    /*    psFree(inPosition); */\
     811    printf("junk(Eaaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    796812    if (isnan(value)) { \
    797813        if (blankPixels != NULL) { \
    … …  
    800816        value = exposedValue; \
    801817    } \
     818    printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     819
     820
    802821
    803822    #define PSIMAGE_TRANSFORM_LOOP(TYPE, MODE) { \
    … …  
    806825            ps##TYPE* outputData=output->data.TYPE[row]; \
    807826            for (int col = 0; col < numCols; col++) { \
     827                printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    808828                outPosition.x = col+col0; \
     829                printf("junk(Ebb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    809830                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
     831                printf("junk(Ebbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    810832                outputData[col] = value; \
    811             } \
    812         } \
    813     }
     833                printf("junk(Ebbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
     834                printf("HERE B: Writing (%d, %d) Image size is (%d, %d)\n", \
     835                       row, col, output->numRows, output->numCols); \
     836                printf("junk(Ebbbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
     837            } \
     838        } \
     839    }
     840
     841    printf("junk(F): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    814842
    815843    #define PSIMAGE_TRANSFORM_FROMLIST(TYPE, MODE) { \
    … …  
    823851                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    824852                output->data.TYPE[y][x] = value; \
    825             } \
    826         } \
    827     }
     853                printf("HERE C: Writing (%d, %d) Image size is (%d, %d)\n", y, x, output->numRows, output->numCols); \
     854            } \
     855        } \
     856    }
     857
     858    printf("junk(G): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    828859
    829860    #define PSIMAGE_TRANSFORM_CASE(MODE) \
    … …  
    843874                    typeStr); \
    844875            psFree(output); \
     876            printf("junk(H): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    845877            return NULL; \
    846878        } \
    … …  
    848880    break;
    849881
     882    printf("junk(J): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    850883    switch (mode) {
    851884        PSIMAGE_TRANSFORM_CASE(FLAT);
    … …  
    857890                mode);
    858891        psFree(output);
    859         return NULL;
    860     }
     892        printf("junk(K): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     893        return NULL;
     894    }
     895    printf("junk(L): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    861896
    862897    return output;

  • trunk/psLib/src/image/psImageGeomManip.h

    r4243 r4286  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-14 02:54:15 $
     10 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-16 22:00:04 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    153153                                             *  output image shall be transformed; otherwise, entire image generated*/
    154154    psImageInterpolateMode mode,       ///< the interpolation scheme to be used
    155     int exposedValue                   ///< Exposed value to which non-corresponding pixels are set
     155    int exposedValue,                   ///< Exposed value to which non-corresponding pixels are set
     156    psPlaneTransform *junk
    156157);
    157158

  • trunk/psLib/src/imageops/psImageGeomManip.c

    r4214 r4286  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-11 02:19:05 $
     12 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-16 22:00:04 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    697697                          const psPixels* pixels,
    698698                          psImageInterpolateMode mode,
    699                           int exposedValue)
     699                          int exposedValue,
     700                          psPlaneTransform *junk)
    700701{
     702    printf("junk(A): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     703
     704
    701705    if (input == NULL) {
    702706        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    … …  
    707711    psElemType type = input->type.type;
    708712
     713    printf("junk(B): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    709714    if (inputMask != NULL) {
    710715        if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
    … …  
    733738    }
    734739
     740    printf("junk(C): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    735741    int row0;
    736742    int row1;
    … …  
    774780    }
    775781
     782    printf("junk(D): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    776783    // loop through the output image using the domain above and transform
    777784    // each output pixel to input coordinates and use psImagePixelInterpolate
    … …  
    780787    psPlane* inPosition = NULL;
    781788
     789
     790
     791
     792
    782793    #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    783794    /* apply the transform to get the position in the input image */ \
     795    printf("junk(Ea): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    784796    inPosition = psPlaneTransformApply(inPosition, outToIn, &outPosition); \
    785797    \
     798    printf("junk(Eaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    786799    if (inPosition == NULL) { \
    787800        psError(PS_ERR_UNKNOWN, false, \
    … …  
    791804    } \
    792805    /* interpolate the cooresponding input pixel to get the output pixel value. */ \
     806    printf("junk(Eaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    793807    ps##TYPE value = p_psImagePixelInterpolate##MODE##_##TYPE(input, \
    794808                     inPosition->x, inPosition->y, \
    795809                     inputMask, inputMaskVal, NAN); \
     810    /*    psFree(inPosition); */\
     811    printf("junk(Eaaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
    796812    if (isnan(value)) { \
    797813        if (blankPixels != NULL) { \
    … …  
    800816        value = exposedValue; \
    801817    } \
     818    printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     819
     820
    802821
    803822    #define PSIMAGE_TRANSFORM_LOOP(TYPE, MODE) { \
    … …  
    806825            ps##TYPE* outputData=output->data.TYPE[row]; \
    807826            for (int col = 0; col < numCols; col++) { \
     827                printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    808828                outPosition.x = col+col0; \
     829                printf("junk(Ebb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    809830                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
     831                printf("junk(Ebbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    810832                outputData[col] = value; \
    811             } \
    812         } \
    813     }
     833                printf("junk(Ebbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
     834                printf("HERE B: Writing (%d, %d) Image size is (%d, %d)\n", \
     835                       row, col, output->numRows, output->numCols); \
     836                printf("junk(Ebbbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
     837            } \
     838        } \
     839    }
     840
     841    printf("junk(F): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    814842
    815843    #define PSIMAGE_TRANSFORM_FROMLIST(TYPE, MODE) { \
    … …  
    823851                PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
    824852                output->data.TYPE[y][x] = value; \
    825             } \
    826         } \
    827     }
     853                printf("HERE C: Writing (%d, %d) Image size is (%d, %d)\n", y, x, output->numRows, output->numCols); \
     854            } \
     855        } \
     856    }
     857
     858    printf("junk(G): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    828859
    829860    #define PSIMAGE_TRANSFORM_CASE(MODE) \
    … …  
    843874                    typeStr); \
    844875            psFree(output); \
     876            printf("junk(H): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
    845877            return NULL; \
    846878        } \
    … …  
    848880    break;
    849881
     882    printf("junk(J): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    850883    switch (mode) {
    851884        PSIMAGE_TRANSFORM_CASE(FLAT);
    … …  
    857890                mode);
    858891        psFree(output);
    859         return NULL;
    860     }
     892        printf("junk(K): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     893        return NULL;
     894    }
     895    printf("junk(L): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
    861896
    862897    return output;

  • trunk/psLib/src/imageops/psImageGeomManip.h

    r4243 r4286  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-14 02:54:15 $
     10 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-16 22:00:04 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    153153                                             *  output image shall be transformed; otherwise, entire image generated*/
    154154    psImageInterpolateMode mode,       ///< the interpolation scheme to be used
    155     int exposedValue                   ///< Exposed value to which non-corresponding pixels are set
     155    int exposedValue,                   ///< Exposed value to which non-corresponding pixels are set
     156    psPlaneTransform *junk
    156157);
    157158

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

    r4219 r4286  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-13 19:39:31 $
     9 *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-16 22:00:03 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    671671}
    672672
    673 static psF64 dOrdPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly)
     673static psF64 dOrdPolynomial2DEval(psF64 x,
     674                                  psF64 y,
     675                                  const psDPolynomial2D* myPoly)
    674676{
    675677    psS32 loop_x = 0;
    … …  
    678680    psF64 xSum = 1.0;
    679681    psF64 ySum = 1.0;
     682    printf("dOrdPolynomial2DEval(%f, %f) (%d, %d)\n", x, y, myPoly->nX, myPoly->nY);
    680683
    681684    for (loop_x = 0; loop_x < myPoly->nX; loop_x++) {
    … …  
    689692        xSum *= x;
    690693    }
     694    printf("dOrdPolynomial2DEval(END)\n");
    691695
    692696    return(polySum);

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

    r4219 r4286  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-13 19:39:31 $
     9 *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-16 22:00:03 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    671671}
    672672
    673 static psF64 dOrdPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly)
     673static psF64 dOrdPolynomial2DEval(psF64 x,
     674                                  psF64 y,
     675                                  const psDPolynomial2D* myPoly)
    674676{
    675677    psS32 loop_x = 0;
    … …  
    678680    psF64 xSum = 1.0;
    679681    psF64 ySum = 1.0;
     682    printf("dOrdPolynomial2DEval(%f, %f) (%d, %d)\n", x, y, myPoly->nX, myPoly->nY);
    680683
    681684    for (loop_x = 0; loop_x < myPoly->nX; loop_x++) {
    … …  
    689692        xSum *= x;
    690693    }
     694    printf("dOrdPolynomial2DEval(END)\n");
    691695
    692696    return(polySum);
Note: See TracChangeset for help on using the changeset viewer.