Index: /trunk/psModules/src/pmImageCombine.c =================================================================== --- /trunk/psModules/src/pmImageCombine.c (revision 4029) +++ /trunk/psModules/src/pmImageCombine.c (revision 4030) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:26:44 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ ) { - PS_PTR_CHECK_NULL(images, combine); + PS_ASSERT_PTR_NON_NULL(images, combine); psU32 numImages = images->n; @@ -79,11 +79,11 @@ psImage *tmpMaskImg = (psImage *) masks->data[i]; - PS_IMAGE_CHECK_NULL(tmpDataImg, combine); - PS_IMAGE_CHECK_NULL(tmpErrorImg, combine); - PS_IMAGE_CHECK_NULL(tmpMaskImg, combine); - - PS_IMAGE_CHECK_TYPE(tmpDataImg, PS_TYPE_F32, combine); - PS_IMAGE_CHECK_TYPE(tmpErrorImg, PS_TYPE_F32, combine); - PS_IMAGE_CHECK_TYPE(tmpMaskImg, PS_TYPE_U8, combine); + PS_ASSERT_IMAGE_NON_NULL(tmpDataImg, combine); + PS_ASSERT_IMAGE_NON_NULL(tmpErrorImg, combine); + PS_ASSERT_IMAGE_NON_NULL(tmpMaskImg, combine); + + PS_ASSERT_IMAGE_TYPE(tmpDataImg, PS_TYPE_F32, combine); + PS_ASSERT_IMAGE_TYPE(tmpErrorImg, PS_TYPE_F32, combine); + PS_ASSERT_IMAGE_TYPE(tmpMaskImg, PS_TYPE_U8, combine); if ((tmpDataImg->numRows != numRows) || (tmpDataImg->numCols != numCols)) { @@ -92,9 +92,9 @@ } - PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL); - } - PS_PTR_CHECK_NULL(pixels, combine); - PS_PTR_CHECK_NULL(stats, combine); + PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL); + } + PS_ASSERT_PTR_NON_NULL(pixels, combine); + PS_ASSERT_PTR_NON_NULL(stats, combine); // Allocate and initialize the combined image, if necessary. @@ -329,13 +329,13 @@ ) { - PS_PTR_CHECK_NULL(images, NULL); - PS_PTR_CHECK_NULL(errors, NULL); - PS_PTR_CHECK_NULL(inToOut, NULL); - PS_PTR_CHECK_NULL(outToIn, NULL); + PS_ASSERT_PTR_NON_NULL(images, NULL); + PS_ASSERT_PTR_NON_NULL(errors, NULL); + PS_ASSERT_PTR_NON_NULL(inToOut, NULL); + PS_ASSERT_PTR_NON_NULL(outToIn, NULL); // Ensure that the psArray parameters have an element for each image. psS32 numImages = images->n; - PS_INT_CHECK_NON_EQUALS(numImages, errors->n, NULL); - PS_INT_CHECK_NON_EQUALS(numImages, inToOut->n, NULL); - PS_INT_CHECK_NON_EQUALS(numImages, outToIn->n, NULL); + PS_ASSERT_INT_EQUAL(numImages, errors->n, NULL); + PS_ASSERT_INT_EQUAL(numImages, inToOut->n, NULL); + PS_ASSERT_INT_EQUAL(numImages, outToIn->n, NULL); // XXX: Loop through all images, ensure their sizes are equal? Index: /trunk/psModules/src/pmNonLinear.c =================================================================== --- /trunk/psModules/src/pmNonLinear.c (revision 4029) +++ /trunk/psModules/src/pmNonLinear.c (revision 4030) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-07 20:00:34 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,8 +33,8 @@ const psPolynomial1D *input1DPoly) { - PS_PTR_CHECK_NULL(inputReadout, NULL); - PS_PTR_CHECK_NULL(inputReadout->image, NULL); - PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL); - PS_PTR_CHECK_NULL(input1DPoly, NULL); + PS_ASSERT_PTR_NON_NULL(inputReadout, NULL); + PS_ASSERT_PTR_NON_NULL(inputReadout->image, NULL); + PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(input1DPoly, NULL); psS32 i; @@ -61,13 +61,13 @@ const psVector *outFlux) { - PS_PTR_CHECK_NULL(inputReadout,NULL); - PS_PTR_CHECK_NULL(inputReadout->image,NULL); - PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL); - PS_PTR_CHECK_NULL(inFlux,NULL); + PS_ASSERT_PTR_NON_NULL(inputReadout,NULL); + PS_ASSERT_PTR_NON_NULL(inputReadout->image,NULL); + PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(inFlux,NULL); if (inFlux->n < 2) { psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements. Returning inputReadout image."); return(inputReadout); } - PS_PTR_CHECK_NULL(outFlux,NULL); + PS_ASSERT_PTR_NON_NULL(outFlux,NULL); psS32 tableSize = inFlux->n; if (inFlux->n != outFlux->n) { @@ -76,6 +76,6 @@ "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n); } - PS_VECTOR_CHECK_TYPE(inFlux, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_TYPE(outFlux, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(outFlux, PS_TYPE_F32, NULL); psS32 i; Index: /trunk/psModules/src/pmObjects.c =================================================================== --- /trunk/psModules/src/pmObjects.c (revision 4029) +++ /trunk/psModules/src/pmObjects.c (revision 4030) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:26:44 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -156,7 +156,7 @@ psF32 threshold) { - PS_VECTOR_CHECK_NULL(vector, NULL); - PS_VECTOR_CHECK_EMPTY(vector, NULL); - PS_VECTOR_CHECK_TYPE(vector, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(vector, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL); + PS_ASSERT_VECTOR_TYPE(vector, PS_TYPE_F32, NULL); int count = 0; int n = vector->n; @@ -250,6 +250,6 @@ psU32 row) { - PS_IMAGE_CHECK_NULL(image, NULL); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_NON_NULL(image, NULL); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL); psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32); @@ -302,6 +302,6 @@ psF32 threshold) { - PS_IMAGE_CHECK_NULL(image, NULL); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_NON_NULL(image, NULL); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL); if ((image->numRows == 1) || (image->numCols == 1)) { psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns."); @@ -514,6 +514,6 @@ const psRegion *valid) { - PS_PTR_CHECK_NULL(peaks, NULL); - // PS_PTR_CHECK_NULL(valid, NULL); + PS_ASSERT_PTR_NON_NULL(peaks, NULL); + // PS_ASSERT_PTR_NON_NULL(valid, NULL); psListElem *tmpListElem = (psListElem *) peaks->head; @@ -540,5 +540,5 @@ psArray *pmPeaksSubset(psArray *peaks, psF32 maxValue, const psRegion *valid) { - PS_PTR_CHECK_NULL(peaks, NULL); + PS_ASSERT_PTR_NON_NULL(peaks, NULL); psArray *output = psArrayAlloc (200); @@ -603,7 +603,7 @@ psF32 outerRadius) { - PS_IMAGE_CHECK_NULL(image, NULL); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL); - PS_PTR_CHECK_NULL(peak, NULL); + PS_ASSERT_IMAGE_NON_NULL(image, NULL); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(peak, NULL); PS_FLOAT_COMPARE(0.0, innerRadius, NULL); PS_FLOAT_COMPARE(innerRadius, outerRadius, NULL); @@ -786,7 +786,7 @@ psF32 radius) { - PS_PTR_CHECK_NULL(source, NULL); - PS_PTR_CHECK_NULL(source->peak, NULL); - PS_PTR_CHECK_NULL(source->pixels, NULL); + PS_ASSERT_PTR_NON_NULL(source, NULL); + PS_ASSERT_PTR_NON_NULL(source->peak, NULL); + PS_ASSERT_PTR_NON_NULL(source->pixels, NULL); PS_FLOAT_COMPARE(0.0, radius, NULL); @@ -961,6 +961,6 @@ bool pmSourceRoughClass(psArray *sources, psMetadata *metadata) { - PS_PTR_CHECK_NULL(sources, false); - PS_PTR_CHECK_NULL(metadata, false); + PS_ASSERT_PTR_NON_NULL(sources, false); + PS_ASSERT_PTR_NON_NULL(metadata, false); psBool rc = true; psArray *peaks = NULL; @@ -983,6 +983,6 @@ { psSource *tmpSrc = (psSource *) sources->data[i]; - PS_PTR_CHECK_NULL(tmpSrc, false); // just skip this one? - PS_PTR_CHECK_NULL(tmpSrc->moments, false); // just skip this one? + PS_ASSERT_PTR_NON_NULL(tmpSrc, false); // just skip this one? + PS_ASSERT_PTR_NON_NULL(tmpSrc->moments, false); // just skip this one? // Sx,Sy are limited at 0. a peak at 0,0 is artificial @@ -1191,9 +1191,9 @@ psF32 radius) { - PS_IMAGE_CHECK_NULL(image, false); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false); - PS_PTR_CHECK_NULL(source, false); - PS_PTR_CHECK_NULL(source->moments, false); - // PS_PTR_CHECK_NULL(source->peak, false); + PS_ASSERT_IMAGE_NON_NULL(image, false); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_PTR_NON_NULL(source->moments, false); + // PS_ASSERT_PTR_NON_NULL(source->peak, false); PS_FLOAT_COMPARE(0.0, radius, false); @@ -1301,9 +1301,9 @@ psModelType model) { - PS_PTR_CHECK_NULL(source, false); - PS_PTR_CHECK_NULL(source->moments, false); - PS_PTR_CHECK_NULL(source->peak, false); - PS_IMAGE_CHECK_NULL(image, false); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_PTR_NON_NULL(source->moments, false); + PS_ASSERT_PTR_NON_NULL(source->peak, false); + PS_ASSERT_IMAGE_NON_NULL(image, false); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false); if (source->models != NULL) { psLogMsg(__func__, PS_LOG_WARN, "WARNING: source->models was non-NULL; calling psFree(source->models).\n"); @@ -1423,7 +1423,7 @@ psU32 col) { - PS_PTR_CHECK_NULL(src, false); - PS_PTR_CHECK_NULL(src->models, false); - PS_PTR_CHECK_NULL(src->models->params, false); + PS_ASSERT_PTR_NON_NULL(src, false); + PS_ASSERT_PTR_NON_NULL(src->models, false); + PS_ASSERT_PTR_NON_NULL(src->models->params, false); // XXX: The following step will not be necessary if the models->params @@ -1560,10 +1560,10 @@ pmContourType mode) { - PS_PTR_CHECK_NULL(source, false); - PS_PTR_CHECK_NULL(image, false); - PS_PTR_CHECK_NULL(source->moments, false); - PS_PTR_CHECK_NULL(source->peak, false); - PS_PTR_CHECK_NULL(source->pixels, false); - PS_PTR_CHECK_NULL(source->models, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_PTR_NON_NULL(image, false); + PS_ASSERT_PTR_NON_NULL(source->moments, false); + PS_ASSERT_PTR_NON_NULL(source->peak, false); + PS_ASSERT_PTR_NON_NULL(source->pixels, false); + PS_ASSERT_PTR_NON_NULL(source->models, false); // @@ -1669,11 +1669,11 @@ const psImage *image) { - PS_PTR_CHECK_NULL(source, false); - PS_PTR_CHECK_NULL(source->moments, false); - PS_PTR_CHECK_NULL(source->peak, false); - PS_PTR_CHECK_NULL(source->pixels, false); - PS_PTR_CHECK_NULL(source->models, false); - PS_IMAGE_CHECK_NULL(image, false); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_PTR_NON_NULL(source->moments, false); + PS_ASSERT_PTR_NON_NULL(source->peak, false); + PS_ASSERT_PTR_NON_NULL(source->pixels, false); + PS_ASSERT_PTR_NON_NULL(source->models, false); + PS_ASSERT_IMAGE_NON_NULL(image, false); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false); psBool rc; @@ -1758,11 +1758,11 @@ psS32 flag) { - PS_PTR_CHECK_NULL(src, false); - PS_PTR_CHECK_NULL(src->moments, false); - PS_PTR_CHECK_NULL(src->peak, false); - PS_PTR_CHECK_NULL(src->pixels, false); - PS_PTR_CHECK_NULL(src->models, false); - PS_IMAGE_CHECK_NULL(image, false); - PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false); + PS_ASSERT_PTR_NON_NULL(src, false); + PS_ASSERT_PTR_NON_NULL(src->moments, false); + PS_ASSERT_PTR_NON_NULL(src->peak, false); + PS_ASSERT_PTR_NON_NULL(src->pixels, false); + PS_ASSERT_PTR_NON_NULL(src->models, false); + PS_ASSERT_IMAGE_NON_NULL(image, false); + PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false); psVector *x = psVectorAlloc(2, PS_TYPE_F32); Index: /trunk/psModules/src/pmReadoutCombine.c =================================================================== --- /trunk/psModules/src/pmReadoutCombine.c (revision 4029) +++ /trunk/psModules/src/pmReadoutCombine.c (revision 4030) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-07 20:00:34 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,18 +51,18 @@ psF32 readnoise) { - PS_PTR_CHECK_NULL(inputs, NULL); - PS_PTR_CHECK_NULL(params, NULL); - PS_PTR_CHECK_NULL(params->stats, NULL); + PS_ASSERT_PTR_NON_NULL(inputs, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(params->stats, NULL); if (zero != NULL) { - PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL); - // PS_VECTOR_CHECK_TYPE_S16_S32_F32(zero, NULL); + PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL); + // PS_ASSERT_VECTOR_TYPE_S16_S32_F32(zero, NULL); } if (scale != NULL) { - PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL); - // PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL); + PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL); + // PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL); } if ((zero != NULL) && (scale != NULL)) { - PS_VECTOR_CHECK_TYPE_EQUAL(zero, scale, NULL); - // PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL); + PS_ASSERT_VECTOR_TYPE_EQUAL(zero, scale, NULL); + // PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL); } @@ -102,7 +102,7 @@ while (NULL != tmpInput) { tmpReadout = (psReadout *) tmpInput->data; - PS_READOUT_CHECK_NULL(tmpReadout, output); - PS_READOUT_CHECK_EMPTY(tmpReadout, output); - PS_READOUT_CHECK_TYPE(tmpReadout, PS_TYPE_F32, output); + PS_ASSERT_READOUT_NON_NULL(tmpReadout, output); + PS_ASSERT_READOUT_NON_EMPTY(tmpReadout, output); + PS_ASSERT_READOUT_TYPE(tmpReadout, PS_TYPE_F32, output); outputType = tmpReadout->image->type.type; @@ -126,5 +126,5 @@ // We ensure that the zero vector is of the proper size. if (zero != NULL) { - PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL); if (numInputs > zero->n) { psError(PS_ERR_UNKNOWN, true, "zero vector has incorrect size (%d). Returning NULL.\n", zero->n); @@ -138,5 +138,5 @@ // We ensure that the scale vector is of the proper size. if (scale != NULL) { - PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL); if (numInputs > scale->n) { psError(PS_ERR_UNKNOWN, true, "scale vector has incorrect size (%d). Returning NULL.\n", scale->n); @@ -160,5 +160,5 @@ *(psS32 *) &(output->row0) = minInputRows; } else { - PS_IMAGE_CHECK_TYPE(output, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_TYPE(output, PS_TYPE_F32, NULL); if (((output->col0 + output->numCols) < maxInputCols) || ((output->row0 + output->numRows) < maxInputRows)) { Index: /trunk/psModules/src/pmSubtractBias.c =================================================================== --- /trunk/psModules/src/pmSubtractBias.c (revision 4029) +++ /trunk/psModules/src/pmSubtractBias.c (revision 4030) @@ -6,6 +6,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 02:02:59 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -184,5 +184,5 @@ // Fit a polynomial to the old overscan vector. myPoly = (psPolynomial1D *) fitSpec; - PS_POLY_CHECK_NULL(myPoly, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); myPoly = psVectorFitPolynomial1D(myPoly, NULL, overscanVector, NULL); if (myPoly == NULL) { @@ -254,7 +254,7 @@ psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4, "---- pmSubtractBias() begin ----\n"); - PS_READOUT_CHECK_NULL(in, NULL); - PS_READOUT_CHECK_EMPTY(in, NULL); - PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL); + PS_ASSERT_READOUT_NON_NULL(in, NULL); + PS_ASSERT_READOUT_NON_EMPTY(in, NULL); + PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL); // @@ -265,5 +265,5 @@ while (NULL != tmpOverscan) { psImage *myOverscanImage = (psImage *) tmpOverscan->data; - PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_TYPE(myOverscanImage, PS_TYPE_F32, NULL); tmpOverscan = tmpOverscan->next; } @@ -351,5 +351,5 @@ myOverscanImage = (psImage *) tmpOverscan->data; - PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_TYPE(myOverscanImage, PS_TYPE_F32, NULL); psStats *rc = psImageStats(myStats, myOverscanImage, NULL, 0xffffffff); if (rc == NULL) { Index: /trunk/psModules/src/pmSubtractSky.c =================================================================== --- /trunk/psModules/src/pmSubtractSky.c (revision 4029) +++ /trunk/psModules/src/pmSubtractSky.c (revision 4030) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-19 00:06:10 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:28:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -249,13 +249,13 @@ psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 4, "---- ImageFitPolynomial() begin ----\n"); - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL); - PS_IMAGE_CHECK_NULL(dataImage, NULL); - PS_IMAGE_CHECK_EMPTY(dataImage, NULL); - PS_IMAGE_CHECK_TYPE(dataImage, PS_TYPE_F32, NULL); - PS_IMAGE_CHECK_NULL(maskImage, NULL); - PS_IMAGE_CHECK_EMPTY(maskImage, NULL); - PS_IMAGE_CHECK_TYPE(maskImage, PS_TYPE_U8, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(dataImage, maskImage, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL); + PS_ASSERT_IMAGE_NON_NULL(dataImage, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(dataImage, NULL); + PS_ASSERT_IMAGE_TYPE(dataImage, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_NON_NULL(maskImage, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(maskImage, NULL); + PS_ASSERT_IMAGE_TYPE(maskImage, PS_TYPE_U8, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(dataImage, maskImage, NULL); psS32 oldPolyX = -1; psS32 oldPolyY = -1; @@ -356,6 +356,6 @@ // Aout = psMatrixLUD(Aout, &outPerm, A); - PS_IMAGE_CHECK_NULL(Aout, NULL); - PS_IMAGE_CHECK_EMPTY(Aout, NULL); + PS_ASSERT_IMAGE_NON_NULL(Aout, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(Aout, NULL); psVector *C = psVectorAlloc(localPolyTerms, PS_TYPE_F64); psMatrixLUSolve(C, Aout, B, outPerm); @@ -424,7 +424,7 @@ psF32 clipSD) { - PS_READOUT_CHECK_NULL(in, NULL); - PS_READOUT_CHECK_EMPTY(in, NULL); - PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL); + PS_ASSERT_READOUT_NON_NULL(in, NULL); + PS_ASSERT_READOUT_NON_EMPTY(in, NULL); + PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL); psTrace(".psModule.pmSubtractSky", 4, "---- pmSubtractSky() begin ----\n"); @@ -584,6 +584,6 @@ if (fit == PM_FIT_POLYNOMIAL) { myPoly = (psPolynomial2D *) fitSpec; - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL); myPoly = ImageFitPolynomial(myPoly, binnedImage, binnedMaskImage);