IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4030


Ignore:
Timestamp:
May 25, 2005, 10:28:32 AM (21 years ago)
Author:
gusciora
Message:

I renamed many of the PS_CHECK macros to PS_ASSERT

Location:
trunk/psModules/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/pmImageCombine.c

    r4028 r4030  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-05-25 19:26:44 $
     7 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 20:28:32 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4949                        )
    5050{
    51     PS_PTR_CHECK_NULL(images, combine);
     51    PS_ASSERT_PTR_NON_NULL(images, combine);
    5252    psU32 numImages = images->n;
    5353
    … …  
    7979        psImage *tmpMaskImg = (psImage *) masks->data[i];
    8080
    81         PS_IMAGE_CHECK_NULL(tmpDataImg, combine);
    82         PS_IMAGE_CHECK_NULL(tmpErrorImg, combine);
    83         PS_IMAGE_CHECK_NULL(tmpMaskImg, combine);
    84 
    85         PS_IMAGE_CHECK_TYPE(tmpDataImg, PS_TYPE_F32, combine);
    86         PS_IMAGE_CHECK_TYPE(tmpErrorImg, PS_TYPE_F32, combine);
    87         PS_IMAGE_CHECK_TYPE(tmpMaskImg, PS_TYPE_U8, combine);
     81        PS_ASSERT_IMAGE_NON_NULL(tmpDataImg, combine);
     82        PS_ASSERT_IMAGE_NON_NULL(tmpErrorImg, combine);
     83        PS_ASSERT_IMAGE_NON_NULL(tmpMaskImg, combine);
     84
     85        PS_ASSERT_IMAGE_TYPE(tmpDataImg, PS_TYPE_F32, combine);
     86        PS_ASSERT_IMAGE_TYPE(tmpErrorImg, PS_TYPE_F32, combine);
     87        PS_ASSERT_IMAGE_TYPE(tmpMaskImg, PS_TYPE_U8, combine);
    8888
    8989        if ((tmpDataImg->numRows != numRows) || (tmpDataImg->numCols != numCols)) {
    … …  
    9292        }
    9393
    94         PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL);
    95         PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL);
    96     }
    97     PS_PTR_CHECK_NULL(pixels, combine);
    98     PS_PTR_CHECK_NULL(stats, combine);
     94        PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL);
     95        PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL);
     96    }
     97    PS_ASSERT_PTR_NON_NULL(pixels, combine);
     98    PS_ASSERT_PTR_NON_NULL(stats, combine);
    9999
    100100    // Allocate and initialize the combined image, if necessary.
    … …  
    329329                       )
    330330{
    331     PS_PTR_CHECK_NULL(images, NULL);
    332     PS_PTR_CHECK_NULL(errors, NULL);
    333     PS_PTR_CHECK_NULL(inToOut, NULL);
    334     PS_PTR_CHECK_NULL(outToIn, NULL);
     331    PS_ASSERT_PTR_NON_NULL(images, NULL);
     332    PS_ASSERT_PTR_NON_NULL(errors, NULL);
     333    PS_ASSERT_PTR_NON_NULL(inToOut, NULL);
     334    PS_ASSERT_PTR_NON_NULL(outToIn, NULL);
    335335    // Ensure that the psArray parameters have an element for each image.
    336336    psS32 numImages = images->n;
    337     PS_INT_CHECK_NON_EQUALS(numImages, errors->n, NULL);
    338     PS_INT_CHECK_NON_EQUALS(numImages, inToOut->n, NULL);
    339     PS_INT_CHECK_NON_EQUALS(numImages, outToIn->n, NULL);
     337    PS_ASSERT_INT_EQUAL(numImages, errors->n, NULL);
     338    PS_ASSERT_INT_EQUAL(numImages, inToOut->n, NULL);
     339    PS_ASSERT_INT_EQUAL(numImages, outToIn->n, NULL);
    340340    // XXX: Loop through all images, ensure their sizes are equal?
    341341

  • trunk/psModules/src/pmNonLinear.c

    r2928 r4030  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-01-07 20:00:34 $
     7 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 20:28:32 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333                                    const psPolynomial1D *input1DPoly)
    3434{
    35     PS_PTR_CHECK_NULL(inputReadout, NULL);
    36     PS_PTR_CHECK_NULL(inputReadout->image, NULL);
    37     PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
    38     PS_PTR_CHECK_NULL(input1DPoly, NULL);
     35    PS_ASSERT_PTR_NON_NULL(inputReadout, NULL);
     36    PS_ASSERT_PTR_NON_NULL(inputReadout->image, NULL);
     37    PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
     38    PS_ASSERT_PTR_NON_NULL(input1DPoly, NULL);
    3939
    4040    psS32 i;
    … …  
    6161                                const psVector *outFlux)
    6262{
    63     PS_PTR_CHECK_NULL(inputReadout,NULL);
    64     PS_PTR_CHECK_NULL(inputReadout->image,NULL);
    65     PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
    66     PS_PTR_CHECK_NULL(inFlux,NULL);
     63    PS_ASSERT_PTR_NON_NULL(inputReadout,NULL);
     64    PS_ASSERT_PTR_NON_NULL(inputReadout->image,NULL);
     65    PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
     66    PS_ASSERT_PTR_NON_NULL(inFlux,NULL);
    6767    if (inFlux->n < 2) {
    6868        psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.");
    6969        return(inputReadout);
    7070    }
    71     PS_PTR_CHECK_NULL(outFlux,NULL);
     71    PS_ASSERT_PTR_NON_NULL(outFlux,NULL);
    7272    psS32 tableSize = inFlux->n;
    7373    if (inFlux->n != outFlux->n) {
    … …  
    7676                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
    7777    }
    78     PS_VECTOR_CHECK_TYPE(inFlux, PS_TYPE_F32, NULL);
    79     PS_VECTOR_CHECK_TYPE(outFlux, PS_TYPE_F32, NULL);
     78    PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);
     79    PS_ASSERT_VECTOR_TYPE(outFlux, PS_TYPE_F32, NULL);
    8080
    8181    psS32 i;

  • trunk/psModules/src/pmObjects.c

    r4028 r4030  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-05-25 19:26:44 $
     7 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 20:28:32 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    156156                            psF32 threshold)
    157157{
    158     PS_VECTOR_CHECK_NULL(vector, NULL);
    159     PS_VECTOR_CHECK_EMPTY(vector, NULL);
    160     PS_VECTOR_CHECK_TYPE(vector, PS_TYPE_F32, NULL);
     158    PS_ASSERT_VECTOR_NON_NULL(vector, NULL);
     159    PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL);
     160    PS_ASSERT_VECTOR_TYPE(vector, PS_TYPE_F32, NULL);
    161161    int count = 0;
    162162    int n = vector->n;
    … …  
    250250                                    psU32 row)
    251251{
    252     PS_IMAGE_CHECK_NULL(image, NULL);
    253     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
     252    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     253    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
    254254
    255255    psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
    … …  
    302302                          psF32 threshold)
    303303{
    304     PS_IMAGE_CHECK_NULL(image, NULL);
    305     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
     304    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     305    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
    306306    if ((image->numRows == 1) || (image->numCols == 1)) {
    307307        psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
    … …  
    514514                    const psRegion *valid)
    515515{
    516     PS_PTR_CHECK_NULL(peaks, NULL);
    517     //    PS_PTR_CHECK_NULL(valid, NULL);
     516    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
     517    //    PS_ASSERT_PTR_NON_NULL(valid, NULL);
    518518
    519519    psListElem *tmpListElem = (psListElem *) peaks->head;
    … …  
    540540psArray *pmPeaksSubset(psArray *peaks, psF32 maxValue, const psRegion *valid)
    541541{
    542     PS_PTR_CHECK_NULL(peaks, NULL);
     542    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
    543543
    544544    psArray *output = psArrayAlloc (200);
    … …  
    603603                           psF32 outerRadius)
    604604{
    605     PS_IMAGE_CHECK_NULL(image, NULL);
    606     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
    607     PS_PTR_CHECK_NULL(peak, NULL);
     605    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     606    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
     607    PS_ASSERT_PTR_NON_NULL(peak, NULL);
    608608    PS_FLOAT_COMPARE(0.0, innerRadius, NULL);
    609609    PS_FLOAT_COMPARE(innerRadius, outerRadius, NULL);
    … …  
    786786                          psF32 radius)
    787787{
    788     PS_PTR_CHECK_NULL(source, NULL);
    789     PS_PTR_CHECK_NULL(source->peak, NULL);
    790     PS_PTR_CHECK_NULL(source->pixels, NULL);
     788    PS_ASSERT_PTR_NON_NULL(source, NULL);
     789    PS_ASSERT_PTR_NON_NULL(source->peak, NULL);
     790    PS_ASSERT_PTR_NON_NULL(source->pixels, NULL);
    791791    PS_FLOAT_COMPARE(0.0, radius, NULL);
    792792
    … …  
    961961bool pmSourceRoughClass(psArray *sources, psMetadata *metadata)
    962962{
    963     PS_PTR_CHECK_NULL(sources, false);
    964     PS_PTR_CHECK_NULL(metadata, false);
     963    PS_ASSERT_PTR_NON_NULL(sources, false);
     964    PS_ASSERT_PTR_NON_NULL(metadata, false);
    965965    psBool rc = true;
    966966    psArray *peaks  = NULL;
    … …  
    983983        {
    984984            psSource *tmpSrc = (psSource *) sources->data[i];
    985             PS_PTR_CHECK_NULL(tmpSrc, false); // just skip this one?
    986             PS_PTR_CHECK_NULL(tmpSrc->moments, false); // just skip this one?
     985            PS_ASSERT_PTR_NON_NULL(tmpSrc, false); // just skip this one?
     986            PS_ASSERT_PTR_NON_NULL(tmpSrc->moments, false); // just skip this one?
    987987
    988988            // Sx,Sy are limited at 0.  a peak at 0,0 is artificial
    … …  
    11911191                            psF32 radius)
    11921192{
    1193     PS_IMAGE_CHECK_NULL(image, false);
    1194     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
    1195     PS_PTR_CHECK_NULL(source, false);
    1196     PS_PTR_CHECK_NULL(source->moments, false);
    1197     // PS_PTR_CHECK_NULL(source->peak, false);
     1193    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1194    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
     1195    PS_ASSERT_PTR_NON_NULL(source, false);
     1196    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1197    // PS_ASSERT_PTR_NON_NULL(source->peak, false);
    11981198    PS_FLOAT_COMPARE(0.0, radius, false);
    11991199
    … …  
    13011301                        psModelType model)
    13021302{
    1303     PS_PTR_CHECK_NULL(source, false);
    1304     PS_PTR_CHECK_NULL(source->moments, false);
    1305     PS_PTR_CHECK_NULL(source->peak, false);
    1306     PS_IMAGE_CHECK_NULL(image, false);
    1307     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1303    PS_ASSERT_PTR_NON_NULL(source, false);
     1304    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1305    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1306    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1307    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    13081308    if (source->models != NULL) {
    13091309        psLogMsg(__func__, PS_LOG_WARN, "WARNING: source->models was non-NULL; calling psFree(source->models).\n");
    … …  
    14231423                       psU32 col)
    14241424{
    1425     PS_PTR_CHECK_NULL(src, false);
    1426     PS_PTR_CHECK_NULL(src->models, false);
    1427     PS_PTR_CHECK_NULL(src->models->params, false);
     1425    PS_ASSERT_PTR_NON_NULL(src, false);
     1426    PS_ASSERT_PTR_NON_NULL(src->models, false);
     1427    PS_ASSERT_PTR_NON_NULL(src->models->params, false);
    14281428
    14291429    // XXX: The following step will not be necessary if the models->params
    … …  
    15601560                         pmContourType mode)
    15611561{
    1562     PS_PTR_CHECK_NULL(source, false);
    1563     PS_PTR_CHECK_NULL(image, false);
    1564     PS_PTR_CHECK_NULL(source->moments, false);
    1565     PS_PTR_CHECK_NULL(source->peak, false);
    1566     PS_PTR_CHECK_NULL(source->pixels, false);
    1567     PS_PTR_CHECK_NULL(source->models, false);
     1562    PS_ASSERT_PTR_NON_NULL(source, false);
     1563    PS_ASSERT_PTR_NON_NULL(image, false);
     1564    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1565    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1566    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     1567    PS_ASSERT_PTR_NON_NULL(source->models, false);
    15681568
    15691569    //
    … …  
    16691669                      const psImage *image)
    16701670{
    1671     PS_PTR_CHECK_NULL(source, false);
    1672     PS_PTR_CHECK_NULL(source->moments, false);
    1673     PS_PTR_CHECK_NULL(source->peak, false);
    1674     PS_PTR_CHECK_NULL(source->pixels, false);
    1675     PS_PTR_CHECK_NULL(source->models, false);
    1676     PS_IMAGE_CHECK_NULL(image, false);
    1677     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1671    PS_ASSERT_PTR_NON_NULL(source, false);
     1672    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1673    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1674    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     1675    PS_ASSERT_PTR_NON_NULL(source->models, false);
     1676    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1677    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    16781678    psBool rc;
    16791679
    … …  
    17581758                             psS32 flag)
    17591759{
    1760     PS_PTR_CHECK_NULL(src, false);
    1761     PS_PTR_CHECK_NULL(src->moments, false);
    1762     PS_PTR_CHECK_NULL(src->peak, false);
    1763     PS_PTR_CHECK_NULL(src->pixels, false);
    1764     PS_PTR_CHECK_NULL(src->models, false);
    1765     PS_IMAGE_CHECK_NULL(image, false);
    1766     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1760    PS_ASSERT_PTR_NON_NULL(src, false);
     1761    PS_ASSERT_PTR_NON_NULL(src->moments, false);
     1762    PS_ASSERT_PTR_NON_NULL(src->peak, false);
     1763    PS_ASSERT_PTR_NON_NULL(src->pixels, false);
     1764    PS_ASSERT_PTR_NON_NULL(src->models, false);
     1765    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1766    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    17671767
    17681768    psVector *x = psVectorAlloc(2, PS_TYPE_F32);

  • trunk/psModules/src/pmReadoutCombine.c

    r2928 r4030  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-01-07 20:00:34 $
     7 *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 20:28:32 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5151                          psF32 readnoise)
    5252{
    53     PS_PTR_CHECK_NULL(inputs, NULL);
    54     PS_PTR_CHECK_NULL(params, NULL);
    55     PS_PTR_CHECK_NULL(params->stats, NULL);
     53    PS_ASSERT_PTR_NON_NULL(inputs, NULL);
     54    PS_ASSERT_PTR_NON_NULL(params, NULL);
     55    PS_ASSERT_PTR_NON_NULL(params->stats, NULL);
    5656    if (zero != NULL) {
    57         PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL);
    58         //        PS_VECTOR_CHECK_TYPE_S16_S32_F32(zero, NULL);
     57        PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL);
     58        //        PS_ASSERT_VECTOR_TYPE_S16_S32_F32(zero, NULL);
    5959    }
    6060    if (scale != NULL) {
    61         PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL);
    62         //        PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL);
     61        PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL);
     62        //        PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL);
    6363    }
    6464    if ((zero != NULL) && (scale != NULL)) {
    65         PS_VECTOR_CHECK_TYPE_EQUAL(zero, scale, NULL);
    66         // PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL);
     65        PS_ASSERT_VECTOR_TYPE_EQUAL(zero, scale, NULL);
     66        // PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL);
    6767    }
    6868
    … …  
    102102    while (NULL != tmpInput) {
    103103        tmpReadout = (psReadout *) tmpInput->data;
    104         PS_READOUT_CHECK_NULL(tmpReadout, output);
    105         PS_READOUT_CHECK_EMPTY(tmpReadout, output);
    106         PS_READOUT_CHECK_TYPE(tmpReadout, PS_TYPE_F32, output);
     104        PS_ASSERT_READOUT_NON_NULL(tmpReadout, output);
     105        PS_ASSERT_READOUT_NON_EMPTY(tmpReadout, output);
     106        PS_ASSERT_READOUT_TYPE(tmpReadout, PS_TYPE_F32, output);
    107107        outputType = tmpReadout->image->type.type;
    108108
    … …  
    126126    // We ensure that the zero vector is of the proper size.
    127127    if (zero != NULL) {
    128         PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL);
     128        PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL);
    129129        if (numInputs > zero->n) {
    130130            psError(PS_ERR_UNKNOWN, true, "zero vector has incorrect size (%d).  Returning NULL.\n", zero->n);
    … …  
    138138    // We ensure that the scale vector is of the proper size.
    139139    if (scale != NULL) {
    140         PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL);
     140        PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL);
    141141        if (numInputs > scale->n) {
    142142            psError(PS_ERR_UNKNOWN, true, "scale vector has incorrect size (%d).  Returning NULL.\n", scale->n);
    … …  
    160160        *(psS32 *) &(output->row0) = minInputRows;
    161161    } else {
    162         PS_IMAGE_CHECK_TYPE(output, PS_TYPE_F32, NULL);
     162        PS_ASSERT_IMAGE_TYPE(output, PS_TYPE_F32, NULL);
    163163        if (((output->col0 + output->numCols) < maxInputCols) ||
    164164                ((output->row0 + output->numRows) < maxInputRows)) {

  • trunk/psModules/src/pmSubtractBias.c

    r3583 r4030  
    66 *  @author George Gusciora, MHPCC
    77 *
    8  *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-03-31 02:02:59 $
     8 *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-05-25 20:28:32 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    184184        // Fit a polynomial to the old overscan vector.
    185185        myPoly = (psPolynomial1D *) fitSpec;
    186         PS_POLY_CHECK_NULL(myPoly, NULL);
     186        PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
    187187        myPoly = psVectorFitPolynomial1D(myPoly, NULL, overscanVector, NULL);
    188188        if (myPoly == NULL) {
    … …  
    254254    psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,
    255255            "---- pmSubtractBias() begin ----\n");
    256     PS_READOUT_CHECK_NULL(in, NULL);
    257     PS_READOUT_CHECK_EMPTY(in, NULL);
    258     PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL);
     256    PS_ASSERT_READOUT_NON_NULL(in, NULL);
     257    PS_ASSERT_READOUT_NON_EMPTY(in, NULL);
     258    PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL);
    259259
    260260    //
    … …  
    265265        while (NULL != tmpOverscan) {
    266266            psImage *myOverscanImage = (psImage *) tmpOverscan->data;
    267             PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
     267            PS_ASSERT_IMAGE_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
    268268            tmpOverscan = tmpOverscan->next;
    269269        }
    … …  
    351351            myOverscanImage = (psImage *) tmpOverscan->data;
    352352
    353             PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
     353            PS_ASSERT_IMAGE_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
    354354            psStats *rc = psImageStats(myStats, myOverscanImage, NULL, 0xffffffff);
    355355            if (rc == NULL) {

  • trunk/psModules/src/pmSubtractSky.c

    r3046 r4030  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-01-19 00:06:10 $
     8 *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-05-25 20:28:32 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    249249    psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 4,
    250250            "---- ImageFitPolynomial() begin ----\n");
    251     PS_POLY_CHECK_NULL(myPoly, NULL);
    252     PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
    253     PS_IMAGE_CHECK_NULL(dataImage, NULL);
    254     PS_IMAGE_CHECK_EMPTY(dataImage, NULL);
    255     PS_IMAGE_CHECK_TYPE(dataImage, PS_TYPE_F32, NULL);
    256     PS_IMAGE_CHECK_NULL(maskImage, NULL);
    257     PS_IMAGE_CHECK_EMPTY(maskImage, NULL);
    258     PS_IMAGE_CHECK_TYPE(maskImage, PS_TYPE_U8, NULL);
    259     PS_IMAGE_CHECK_SIZE_EQUAL(dataImage, maskImage, NULL);
     251    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     252    PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
     253    PS_ASSERT_IMAGE_NON_NULL(dataImage, NULL);
     254    PS_ASSERT_IMAGE_NON_EMPTY(dataImage, NULL);
     255    PS_ASSERT_IMAGE_TYPE(dataImage, PS_TYPE_F32, NULL);
     256    PS_ASSERT_IMAGE_NON_NULL(maskImage, NULL);
     257    PS_ASSERT_IMAGE_NON_EMPTY(maskImage, NULL);
     258    PS_ASSERT_IMAGE_TYPE(maskImage, PS_TYPE_U8, NULL);
     259    PS_ASSERT_IMAGES_SIZE_EQUAL(dataImage, maskImage, NULL);
    260260    psS32 oldPolyX = -1;
    261261    psS32 oldPolyY = -1;
    … …  
    356356    //
    357357    Aout = psMatrixLUD(Aout, &outPerm, A);
    358     PS_IMAGE_CHECK_NULL(Aout, NULL);
    359     PS_IMAGE_CHECK_EMPTY(Aout, NULL);
     358    PS_ASSERT_IMAGE_NON_NULL(Aout, NULL);
     359    PS_ASSERT_IMAGE_NON_EMPTY(Aout, NULL);
    360360    psVector *C = psVectorAlloc(localPolyTerms, PS_TYPE_F64);
    361361    psMatrixLUSolve(C, Aout, B, outPerm);
    … …  
    424424                         psF32 clipSD)
    425425{
    426     PS_READOUT_CHECK_NULL(in, NULL);
    427     PS_READOUT_CHECK_EMPTY(in, NULL);
    428     PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL);
     426    PS_ASSERT_READOUT_NON_NULL(in, NULL);
     427    PS_ASSERT_READOUT_NON_EMPTY(in, NULL);
     428    PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL);
    429429    psTrace(".psModule.pmSubtractSky", 4,
    430430            "---- pmSubtractSky() begin ----\n");
    … …  
    584584    if (fit == PM_FIT_POLYNOMIAL) {
    585585        myPoly = (psPolynomial2D *) fitSpec;
    586         PS_POLY_CHECK_NULL(myPoly, NULL);
    587         PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
     586        PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     587        PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
    588588
    589589        myPoly = ImageFitPolynomial(myPoly, binnedImage, binnedMaskImage);
Note: See TracChangeset for help on using the changeset viewer.