IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4029 for trunk/psLib/src/astro


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

I renamed many of the PS_CHECK macros to PS_ASSERT...

Location:
trunk/psLib/src/astro
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r3991 r4029  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-05-20 00:15:50 $
     12*  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-05-25 20:26:55 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9494psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform)
    9595{
    96     PS_PTR_CHECK_NULL(transform, 0);
    97     PS_PTR_CHECK_NULL(transform->x, 0);
    98     PS_PTR_CHECK_NULL(transform->y, 0);
     96    PS_ASSERT_PTR_NON_NULL(transform, 0);
     97    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
     98    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
    9999
    100100    psF64 A = 0.0;
    … …  
    160160psS32 p_psIsProjectionLinear(psPlaneTransform *transform)
    161161{
    162     PS_PTR_CHECK_NULL(transform, 0);
    163     PS_PTR_CHECK_NULL(transform->x, 0);
    164     PS_PTR_CHECK_NULL(transform->y, 0);
     162    PS_ASSERT_PTR_NON_NULL(transform, 0);
     163    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
     164    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
    165165
    166166    for (psS32 i=0;i<(transform->x->nX);i++) {
    … …  
    223223psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
    224224{
    225     PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
    226     PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
     225    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
     226    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
    227227
    228228    psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform));
    … …  
    238238                               const psPlane* coords)
    239239{
    240     PS_PTR_CHECK_NULL(transform, NULL);
    241     PS_PTR_CHECK_NULL(transform->x, NULL);
    242     PS_PTR_CHECK_NULL(transform->y, NULL);
    243     PS_PTR_CHECK_NULL(coords, NULL);
     240    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     241    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
     242    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
     243    PS_ASSERT_PTR_NON_NULL(coords, NULL);
    244244
    245245    if (out == NULL) {
    … …  
    267267psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4)
    268268{
    269     PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
    270     PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
    271     PS_INT_CHECK_NON_NEGATIVE(n3, NULL);
    272     PS_INT_CHECK_NON_NEGATIVE(n4, NULL);
     269    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
     270    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
     271    PS_ASSERT_INT_NONNEGATIVE(n3, NULL);
     272    PS_ASSERT_INT_NONNEGATIVE(n4, NULL);
    273273
    274274    psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort));
    … …  
    290290                             float magnitude)
    291291{
    292     PS_PTR_CHECK_NULL(transform, NULL);
    293     PS_PTR_CHECK_NULL(transform->x, NULL);
    294     PS_PTR_CHECK_NULL(transform->y, NULL);
    295     PS_PTR_CHECK_NULL(coords, NULL);
     292    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     293    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
     294    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
     295    PS_ASSERT_PTR_NON_NULL(coords, NULL);
    296296
    297297    if (out == NULL) {
    … …  
    364364                                 const psSphere* coord)
    365365{
    366     PS_PTR_CHECK_NULL(transform, NULL);
    367     PS_PTR_CHECK_NULL(coord, NULL);
     366    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     367    PS_ASSERT_PTR_NON_NULL(coord, NULL);
    368368
    369369    if (out == NULL) {
    … …  
    394394
    395395    // Check for null parameter
    396     PS_PTR_CHECK_NULL(time, NULL);
     396    PS_ASSERT_PTR_NON_NULL(time, NULL);
    397397
    398398    // Convert psTime to MJD
    … …  
    427427
    428428    // Check for null parameter
    429     PS_PTR_CHECK_NULL(time, NULL);
     429    PS_ASSERT_PTR_NON_NULL(time, NULL);
    430430
    431431    // Convert psTime to MJD
    … …  
    498498                   const psProjection* projection)
    499499{
    500     PS_PTR_CHECK_NULL(coord, NULL);
    501     PS_PTR_CHECK_NULL(projection, NULL);
     500    PS_ASSERT_PTR_NON_NULL(coord, NULL);
     501    PS_ASSERT_PTR_NON_NULL(projection, NULL);
    502502
    503503    psF64   theta = 0.0;
    … …  
    550550                      const psProjection* projection)
    551551{
    552     PS_PTR_CHECK_NULL(coord, NULL);
    553     PS_PTR_CHECK_NULL(projection, NULL);
     552    PS_ASSERT_PTR_NON_NULL(coord, NULL);
     553    PS_ASSERT_PTR_NON_NULL(projection, NULL);
    554554
    555555    psF64  theta = 0.0;
    … …  
    622622                            psSphereOffsetUnit unit)
    623623{
    624     PS_PTR_CHECK_NULL(position1, NULL);
    625     PS_PTR_CHECK_NULL(position2, NULL);
     624    PS_ASSERT_PTR_NON_NULL(position1, NULL);
     625    PS_ASSERT_PTR_NON_NULL(position2, NULL);
    626626
    627627    // Check positions near 90 degree and issue warnings if necessary
    … …  
    721721                            psSphereOffsetUnit unit)
    722722{
    723     PS_PTR_CHECK_NULL(position, NULL);
    724     PS_PTR_CHECK_NULL(offset, NULL);
     723    PS_ASSERT_PTR_NON_NULL(position, NULL);
     724    PS_ASSERT_PTR_NON_NULL(offset, NULL);
    725725
    726726    psSphere* tmp;
    … …  
    811811{
    812812    // Check input for NULL pointers
    813     PS_PTR_CHECK_NULL(coords, NULL);
    814     PS_PTR_CHECK_NULL(fromTime, NULL);
    815     PS_PTR_CHECK_NULL(toTime, NULL);
     813    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     814    PS_ASSERT_PTR_NON_NULL(fromTime, NULL);
     815    PS_ASSERT_PTR_NON_NULL(toTime, NULL);
    816816
    817817    // Calculate Julian centuries
    … …  
    904904    // XXX: This does not yet use region and nSamples:  need to modify -rdd
    905905
    906     PS_PTR_CHECK_NULL(trans1, NULL);
    907     PS_PTR_CHECK_NULL(trans2, NULL);
     906    PS_ASSERT_PTR_NON_NULL(trans1, NULL);
     907    PS_ASSERT_PTR_NON_NULL(trans2, NULL);
    908908    //TRACE: printf("psPlaneTransformCombine(%d, %d, %d, %d: %d, %d, %d, %d)\n", trans1->x->nX, trans1->x->nY, trans1->y->nX, trans1->y->nY, trans2->x->nX, trans2->x->nY, trans2->y->nX, trans2->y->nY);
    909909    //
    … …  
    10471047                         float sigmaClip)
    10481048{
    1049     PS_PTR_CHECK_NULL(trans, NULL);
    1050     PS_PTR_CHECK_NULL(source, NULL);
    1051     PS_PTR_CHECK_NULL(dest, NULL);
     1049    PS_ASSERT_PTR_NON_NULL(trans, NULL);
     1050    PS_ASSERT_PTR_NON_NULL(source, NULL);
     1051    PS_ASSERT_PTR_NON_NULL(dest, NULL);
    10521052
    10531053    psS32 numCoords = PS_MIN(source->n, dest->n);
    … …  
    11591159        int nSamples)
    11601160{
    1161     PS_PTR_CHECK_NULL(in, NULL);
     1161    PS_ASSERT_PTR_NON_NULL(in, NULL);
    11621162    //
    11631163    // If the transform is linear, then invert it exactly and return.

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

    r3884 r4029  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-05-11 22:02:15 $
     12 *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-05-25 20:26:55 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    178178        }
    179179        table = (psLookupTable*)tableMetadataItem->data.V;
    180         PS_PTR_CHECK_NULL(table,0.0);
     180        PS_ASSERT_PTR_NON_NULL(table,0.0);
    181181
    182182        // Attempt to interpolate table
    … …  
    403403
    404404    // Error checks
    405     PS_PTR_CHECK_NULL(time,NULL);
    406     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
     405    PS_ASSERT_PTR_NON_NULL(time,NULL);
     406    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
    407407
    408408    if (time->type == type) { // time already right type.  That was easy!
    … …  
    448448
    449449    // Error checks
    450     PS_PTR_CHECK_NULL(time,NAN);
    451     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
     450    PS_ASSERT_PTR_NON_NULL(time,NAN);
     451    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
    452452
    453453    // Calculate TAI or UTC time based on type of time user passes
    … …  
    519519
    520520    // Error checks
    521     PS_PTR_CHECK_NULL(time,NAN);
    522     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
     521    PS_ASSERT_PTR_NON_NULL(time,NAN);
     522    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
    523523
    524524    if(time->type != PS_TIME_TAI) {
    … …  
    560560        }
    561561        dut = (psVector*)tableMetadataItem->data.V;
    562         PS_PTR_CHECK_NULL(dut,0.0);
     562        PS_ASSERT_PTR_NON_NULL(dut,0.0);
    563563
    564564        t = 2000.0 + (mjd - 51544.03)/365.2422;
    … …  
    592592
    593593    // Error checks
    594     PS_PTR_CHECK_NULL(time,NULL);
    595     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
     594    PS_ASSERT_PTR_NON_NULL(time,NULL);
     595    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
    596596
    597597    if(time->type != PS_TIME_TAI)
    … …  
    658658        }
    659659        xp = (psVector*)tableMetadataItem->data.V;
    660         PS_PTR_CHECK_NULL(xp,NULL);
     660        PS_ASSERT_PTR_NON_NULL(xp,NULL);
    661661
    662662        // Get yp
    … …  
    667667        }
    668668        yp = (psVector*)tableMetadataItem->data.V;
    669         PS_PTR_CHECK_NULL(yp,NULL);
     669        PS_ASSERT_PTR_NON_NULL(yp,NULL);
    670670
    671671        // Calculate "a" and "c" constants
    … …  
    715715
    716716    // Error checks
    717     PS_PTR_CHECK_NULL(time,NAN);
    718     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
     717    PS_ASSERT_PTR_NON_NULL(time,NAN);
     718    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
    719719
    720720    // Check time metadata
    … …  
    733733    }
    734734    table = (psLookupTable*)tableMetadataItem->data.V;
    735     PS_PTR_CHECK_NULL(table,0);
     735    PS_ASSERT_PTR_NON_NULL(table,0);
    736736
    737737    // Determine Julian and modified Julian dates used in table lookup and time delta calculation
    … …  
    767767
    768768    // Error checks
    769     PS_PTR_CHECK_NULL(time1,0);
    770     PS_PTR_CHECK_NULL(time2,0);
    771     PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0);
    772     PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0);
     769    PS_ASSERT_PTR_NON_NULL(time1,0);
     770    PS_ASSERT_PTR_NON_NULL(time2,0);
     771    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0);
     772    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0);
    773773    diff = abs((psS64)psTimeGetTAIDelta((psTime*)time1)-(psS64)psTimeGetTAIDelta((psTime*)time2));
    774774
    … …  
    781781
    782782    // Error checks
    783     PS_PTR_CHECK_NULL(time,NAN);
    784     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
     783    PS_ASSERT_PTR_NON_NULL(time,NAN);
     784    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
    785785
    786786    // Julian date conversion
    … …  
    800800
    801801    // Error checks
    802     PS_PTR_CHECK_NULL(time,NAN);
    803     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
     802    PS_ASSERT_PTR_NON_NULL(time,NAN);
     803    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
    804804
    805805    // Modified Julian date conversion
    … …  
    823823
    824824    // Error checks
    825     PS_PTR_CHECK_NULL(time,NULL);
    826     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
     825    PS_ASSERT_PTR_NON_NULL(time,NULL);
     826    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
    827827
    828828    tempString = psAlloc(MAX_TIME_STRING_LENGTH);
    … …  
    856856
    857857    // Error checks
    858     PS_PTR_CHECK_NULL(time,timevalTime);
    859     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,timevalTime);
     858    PS_ASSERT_PTR_NON_NULL(time,timevalTime);
     859    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,timevalTime);
    860860
    861861    timevalTime.tv_sec = time->sec;
    … …  
    879879
    880880    // Error checks
    881     PS_PTR_CHECK_NULL(time,NULL);
    882     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
     881    PS_ASSERT_PTR_NON_NULL(time,NULL);
     882    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
    883883
    884884    seconds = time->sec%60;
    … …  
    949949
    950950    // Error check
    951     PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
     951    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
    952952
    953953    return outTime;
    … …  
    975975
    976976    // Error check
    977     PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
     977    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
    978978
    979979    return outTime;
    … …  
    993993    }
    994994
    995     PS_INT_CHECK_NON_NEGATIVE(tmTime.tm_year, outTime);
    996     PS_INT_CHECK_RANGE(tmTime.tm_mon,1,12,outTime);
    997     PS_INT_CHECK_RANGE(tmTime.tm_mday,1,31,outTime);
    998     PS_INT_CHECK_RANGE(tmTime.tm_hour,0,23,outTime);
    999     PS_INT_CHECK_RANGE(tmTime.tm_min,0,59,outTime);
    1000     PS_INT_CHECK_RANGE(tmTime.tm_sec,0,59,outTime);
    1001     PS_INT_CHECK_RANGE(millisecond,0,999,outTime);
     995    PS_ASSERT_INT_NONNEGATIVE(tmTime.tm_year, outTime);
     996    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mon,1,12,outTime);
     997    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mday,1,31,outTime);
     998    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_hour,0,23,outTime);
     999    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_min,0,59,outTime);
     1000    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_sec,0,59,outTime);
     1001    PS_ASSERT_INT_WITHIN_RANGE(millisecond,0,999,outTime);
    10021002
    10031003    tmTime.tm_year -= 1900;
    … …  
    10181018
    10191019    // Error check
    1020     PS_PTR_CHECK_NULL(time,NULL);
     1020    PS_ASSERT_PTR_NON_NULL(time,NULL);
    10211021
    10221022    // Allocate psTime struct
    … …  
    10281028
    10291029    // Error check
    1030     PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
     1030    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
    10311031
    10321032    return outTime;
    … …  
    10461046
    10471047    // Error check
    1048     PS_PTR_CHECK_NULL(time,NULL);
     1048    PS_ASSERT_PTR_NON_NULL(time,NULL);
    10491049
    10501050    // Allocate psTime struct
    … …  
    10871087
    10881088    // Error check
    1089     PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
     1089    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
    10901090
    10911091    return outTime;
    … …  
    11001100
    11011101    // Error checks
    1102     PS_PTR_CHECK_NULL(time,NULL);
    1103     PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
     1102    PS_ASSERT_PTR_NON_NULL(time,NULL);
     1103    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
    11041104
    11051105    // Convert time to TAI if necessary, but without changing input arguments
    … …  
    11201120
    11211121    // Error check
    1122     PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
     1122    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
    11231123
    11241124    // Convert result to same time type as input
    … …  
    11421142
    11431143    // Error checks
    1144     PS_PTR_CHECK_NULL(time1,0.0);
    1145     PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0.0);
    1146     PS_PTR_CHECK_NULL(time2,0.0);
    1147     PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0.0);
     1144    PS_ASSERT_PTR_NON_NULL(time1,0.0);
     1145    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0.0);
     1146    PS_ASSERT_PTR_NON_NULL(time2,0.0);
     1147    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0.0);
    11481148
    11491149    // Convert time to TAI if necessary, but without changing input arguments
Note: See TracChangeset for help on using the changeset viewer.