Index: /trunk/psLib/src/dataManip/psConstants.h =================================================================== --- /trunk/psLib/src/dataManip/psConstants.h (revision 4027) +++ /trunk/psLib/src/dataManip/psConstants.h (revision 4028) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:25:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,4 +21,6 @@ * throw a psError if the CONDITION is true. However, some throw the error * if the CONDITION is false. This should be consistant. + * + * XXX: rename all these with form PS_ASSERT_CONDITION(). * */ @@ -44,4 +46,5 @@ #define M_2_PI 0.6366197723675813430755350534900574 /* 2/pi */ #endif +#define PS_PI 3.1415926535897932384626433832795029 /* pi */ #define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0) Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 4027) +++ /trunk/psLib/src/dataManip/psStats.c (revision 4028) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.127 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:25:29 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -705,4 +705,6 @@ Returns NULL + +XXX: Use static vectors. *****************************************************************************/ bool p_psVectorSampleQuartiles(const psVector* myVector, Index: /trunk/psLib/src/math/psConstants.h =================================================================== --- /trunk/psLib/src/math/psConstants.h (revision 4027) +++ /trunk/psLib/src/math/psConstants.h (revision 4028) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:25:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,4 +21,6 @@ * throw a psError if the CONDITION is true. However, some throw the error * if the CONDITION is false. This should be consistant. + * + * XXX: rename all these with form PS_ASSERT_CONDITION(). * */ @@ -44,4 +46,5 @@ #define M_2_PI 0.6366197723675813430755350534900574 /* 2/pi */ #endif +#define PS_PI 3.1415926535897932384626433832795029 /* pi */ #define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0) Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 4027) +++ /trunk/psLib/src/math/psStats.c (revision 4028) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.127 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:25:29 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -705,4 +705,6 @@ Returns NULL + +XXX: Use static vectors. *****************************************************************************/ bool p_psVectorSampleQuartiles(const psVector* myVector, Index: /trunk/psModules/src/pmImageCombine.c =================================================================== --- /trunk/psModules/src/pmImageCombine.c (revision 4027) +++ /trunk/psModules/src/pmImageCombine.c (revision 4028) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 00:33:44 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:26:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -226,6 +226,6 @@ // // Loop over all pixels in all images, set the appropriate data, mask, - // error vectors, call psVectorStats(), and set the result in the combine - // image. + // error vectors, call psVectorStats(), and set the result in the + // combine image. // for (psS32 row = 0 ; row < numRows ; row++) { @@ -318,6 +318,6 @@ XXX: Use static variables. XXX: Optimization: we don't need to transform the entire mask image. -XXX: The inToOut and outToIn transforms are confusing. Verify that what I think - they mean syncs with PWP. +XXX: The inToOut and outToIn transforms are confusing. Verify that what + I think they mean syncs with PWP. *****************************************************************************/ psArray *pmRejectPixels(const psArray *images, ///< Array of input images @@ -356,5 +356,5 @@ psS32 numCols = ((psImage *) images->data[0])->numCols; psS32 numRows = ((psImage *) images->data[0])->numRows; - psRegion *myRegion = psRegionAlloc(0, numCols-1, 0, numRows-1); + psRegion myRegion = psRegionSet(0, numCols-1, 0, numRows-1); psU32 maskVal = 1; @@ -368,8 +368,8 @@ psPixels *pixelList = (psPixels *) errors->data[im]; psImage *currImage = (psImage *) images->data[im]; - myRegion->x0 = 0; - myRegion->x1 = currImage->numCols - 1; - myRegion->y0 = 0; - myRegion->y1 = currImage->numRows - 1; + myRegion.x0 = 0; + myRegion.x1 = currImage->numCols - 1; + myRegion.y0 = 0; + myRegion.y1 = currImage->numRows - 1; psPlaneTransform *myInToOut = (psPlaneTransform *) inToOut->data[im]; psPlaneTransform *myOutToIn = (psPlaneTransform *) outToIn->data[im]; @@ -384,5 +384,7 @@ // Transform that mask image into detector coordinate space // - psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0); + // XXX: conform to new psImageTransform() + // psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0); + psImage *transformedImage = NULL; // @@ -457,5 +459,5 @@ } - psFree(myRegion); + // psFree(myRegion); psFree(inCoords); psFree(outCoords); Index: /trunk/psModules/src/pmObjects.c =================================================================== --- /trunk/psModules/src/pmObjects.c (revision 4027) +++ /trunk/psModules/src/pmObjects.c (revision 4028) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 20:56:31 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 19:26:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -664,9 +664,11 @@ // Grab a subimage of the original image of size (2 * outerRadius). // - psImage *subImage = psImageSubset((psImage *) image, - SubImageStartCol, - SubImageStartRow, - SubImageEndCol, - SubImageEndRow); + // XXX: Must fix for new psImageSubset + // psImage *subImage = psImageSubset((psImage *) image, + // SubImageStartCol, + // SubImageStartRow, + // SubImageEndCol, + // SubImageEndRow); + psImage *subImage = NULL; // printf("pmSourceLocalSky: subimage width/length is (%d, %d)\n", subImage->numCols, subImage->numRows); psImage *subImageMask = psImageAlloc(subImage->numCols, @@ -1244,9 +1246,10 @@ psFree(source->pixels); } - source->pixels = psImageSubset((psImage *) image, - SubImageStartCol, - SubImageStartRow, - SubImageEndCol, - SubImageEndRow); + // XXX: Must fix this. psImageSubset() has different parameters in latest CVS. + // source->pixels = psImageSubset((psImage *) image, + // SubImageStartCol, + // SubImageStartRow, + // SubImageEndCol, + // SubImageEndRow); // XXX: Must recycle image.