IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4028


Ignore:
Timestamp:
May 25, 2005, 9:26:44 AM (21 years ago)
Author:
gusciora
Message:

...

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psConstants.h

    r3990 r4028  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-05-19 23:57:37 $
     8 *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-05-25 19:25:29 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121 *  throw a psError if the CONDITION is true.  However, some throw the error
    2222 *  if the CONDITION is false.  This should be consistant.
     23 *
     24 *  XXX: rename all these with form PS_ASSERT_CONDITION().
    2325 *
    2426 */
    … …  
    4446#define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
    4547#endif
     48#define PS_PI   3.1415926535897932384626433832795029  /* pi */
    4649
    4750#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)

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

    r3990 r4028  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-19 23:57:37 $
     11 *  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-05-25 19:25:29 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    705705Returns
    706706    NULL
     707 
     708XXX: Use static vectors.
    707709 *****************************************************************************/
    708710bool p_psVectorSampleQuartiles(const psVector* myVector,

  • trunk/psLib/src/math/psConstants.h

    r3990 r4028  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-05-19 23:57:37 $
     8 *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-05-25 19:25:29 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121 *  throw a psError if the CONDITION is true.  However, some throw the error
    2222 *  if the CONDITION is false.  This should be consistant.
     23 *
     24 *  XXX: rename all these with form PS_ASSERT_CONDITION().
    2325 *
    2426 */
    … …  
    4446#define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
    4547#endif
     48#define PS_PI   3.1415926535897932384626433832795029  /* pi */
    4649
    4750#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)

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

    r3990 r4028  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-19 23:57:37 $
     11 *  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-05-25 19:25:29 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    705705Returns
    706706    NULL
     707 
     708XXX: Use static vectors.
    707709 *****************************************************************************/
    708710bool p_psVectorSampleQuartiles(const psVector* myVector,

  • trunk/psModules/src/pmImageCombine.c

    r3878 r4028  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-05-11 00:33:44 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 19:26:44 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    226226        //
    227227        // Loop over all pixels in all images, set the appropriate data, mask,
    228         // error vectors, call psVectorStats(), and set the result in the combine
    229         // image.
     228        // error vectors, call psVectorStats(), and set the result in the
     229        // combine image.
    230230        //
    231231        for (psS32 row = 0 ; row < numRows ; row++) {
    … …  
    318318XXX: Use static variables.
    319319XXX: Optimization: we don't need to transform the entire mask image.
    320 XXX: The inToOut and outToIn transforms are confusing.  Verify that what I think
    321      they mean syncs with PWP.
     320XXX: The inToOut and outToIn transforms are confusing.  Verify that what
     321     I think they mean syncs with PWP.
    322322 *****************************************************************************/
    323323psArray *pmRejectPixels(const psArray *images,          ///< Array of input images
    … …  
    356356    psS32 numCols = ((psImage *) images->data[0])->numCols;
    357357    psS32 numRows = ((psImage *) images->data[0])->numRows;
    358     psRegion *myRegion = psRegionAlloc(0, numCols-1, 0, numRows-1);
     358    psRegion myRegion = psRegionSet(0, numCols-1, 0, numRows-1);
    359359    psU32 maskVal = 1;
    360360
    … …  
    368368        psPixels *pixelList = (psPixels *) errors->data[im];
    369369        psImage *currImage = (psImage *) images->data[im];
    370         myRegion->x0 = 0;
    371         myRegion->x1 = currImage->numCols - 1;
    372         myRegion->y0 = 0;
    373         myRegion->y1 = currImage->numRows - 1;
     370        myRegion.x0 = 0;
     371        myRegion.x1 = currImage->numCols - 1;
     372        myRegion.y0 = 0;
     373        myRegion.y1 = currImage->numRows - 1;
    374374        psPlaneTransform *myInToOut = (psPlaneTransform *) inToOut->data[im];
    375375        psPlaneTransform *myOutToIn = (psPlaneTransform *) outToIn->data[im];
    … …  
    384384        // Transform that mask image into detector coordinate space
    385385        //
    386         psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0);
     386        // XXX: conform to new psImageTransform()
     387        //        psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0);
     388        psImage *transformedImage = NULL;
    387389
    388390        //
    … …  
    457459    }
    458460
    459     psFree(myRegion);
     461    //    psFree(myRegion);
    460462    psFree(inCoords);
    461463    psFree(outCoords);

  • trunk/psModules/src/pmObjects.c

    r3881 r4028  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-05-11 20:56:31 $
     7 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 19:26:44 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    664664    // Grab a subimage of the original image of size (2 * outerRadius).
    665665    //
    666     psImage *subImage = psImageSubset((psImage *) image,
    667                                       SubImageStartCol,
    668                                       SubImageStartRow,
    669                                       SubImageEndCol,
    670                                       SubImageEndRow);
     666    // XXX: Must fix for new psImageSubset
     667    //    psImage *subImage = psImageSubset((psImage *) image,
     668    //                                      SubImageStartCol,
     669    //                                      SubImageStartRow,
     670    //                                      SubImageEndCol,
     671    //                                      SubImageEndRow);
     672    psImage *subImage = NULL;
    671673    //    printf("pmSourceLocalSky: subimage width/length is (%d, %d)\n", subImage->numCols, subImage->numRows);
    672674    psImage *subImageMask = psImageAlloc(subImage->numCols,
    … …  
    12441246        psFree(source->pixels);
    12451247    }
    1246     source->pixels = psImageSubset((psImage *) image,
    1247                                    SubImageStartCol,
    1248                                    SubImageStartRow,
    1249                                    SubImageEndCol,
    1250                                    SubImageEndRow);
     1248    // XXX: Must fix this.  psImageSubset() has different parameters in latest CVS.
     1249    //    source->pixels = psImageSubset((psImage *) image,
     1250    //                                   SubImageStartCol,
     1251    //                                   SubImageStartRow,
     1252    //                                   SubImageEndCol,
     1253    //                                   SubImageEndRow);
    12511254
    12521255    // XXX: Must recycle image.
Note: See TracChangeset for help on using the changeset viewer.