IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 15, 2005, 3:10:36 PM (21 years ago)
Author:
gusciora
Message:

There are a lot of changes here required by the new SDRS. Most changes
involve the new definitions of the psAstrometry types. Not all tests work
correctly.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/tst_pmObjects01.c

    r4579 r4770  
    1919 * abd never deallocate, no error is generated.
    2020 *
    21  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    22  *  @date $Date: 2005-07-19 01:44:48 $
     21 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     22 *  @date $Date: 2005-08-16 01:10:36 $
    2323 *
    2424 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6363int main(int argc, char* argv[])
    6464{
     65    psLogSetFormat("HLNM");
    6566    return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
    66     //    test02();
    6767}
    6868
    … …  
    7676
    7777    printf("Testing pmPeakAlloc()...\n");
    78     psPeak *tmpPeak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE);
     78    pmPeak *tmpPeak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE);
    7979    if (tmpPeak == NULL) {
    80         printf("TEST ERROR: pmPeakAlloc() returned a NULL psPeak\n");
     80        printf("TEST ERROR: pmPeakAlloc() returned a NULL pmPeak\n");
    8181        testStatus = false;
    8282    } else {
    8383        if (tmpPeak->x != 1) {
    84             printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->x\n");
     84            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->x\n");
    8585            testStatus = false;
    8686        }
    8787        if (tmpPeak->y != 2) {
    88             printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->y\n");
     88            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->y\n");
    8989            testStatus = false;
    9090        }
    9191        if (tmpPeak->counts != 3.0) {
    92             printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->counts\n");
     92            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->counts\n");
    9393            testStatus = false;
    9494        }
    9595        if (tmpPeak->class != PM_PEAK_LONE) {
    96             printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->class\n");
     96            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->class\n");
    9797            testStatus = false;
    9898        }
    … …  
    101101
    102102    printf("Testing pmMomentsAlloc()...\n");
    103     psMoments *tmpMoments = pmMomentsAlloc();
     103    pmMoments *tmpMoments = pmMomentsAlloc();
    104104    if (tmpMoments == NULL) {
    105         printf("TEST ERROR: pmMomentsAlloc() returned a NULL psMoments\n");
     105        printf("TEST ERROR: pmMomentsAlloc() returned a NULL pmMoments\n");
    106106        testStatus = false;
    107107    } else {
    … …  
    115115                (fabs(tmpMoments->Sky-0.0) > ERROR_TOL) ||
    116116                (tmpMoments->nPixels != 0)) {
    117             printf("TEST ERROR: pmMomentsAlloc() did not properly initialize the psMoments structure.\n");
     117            printf("TEST ERROR: pmMomentsAlloc() did not properly initialize the pmMoments structure.\n");
    118118            testStatus = false;
    119119        }
    … …  
    122122
    123123    printf("Testing pmModelAlloc(PS_MODEL_GAUSS)...\n");
    124     psModel *tmpModel = pmModelAlloc(PS_MODEL_GAUSS);
     124    pmModel *tmpModel = pmModelAlloc(PS_MODEL_GAUSS);
    125125    if (tmpModel == NULL) {
    126         printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) returned a NULL psModel\n");
     126        printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) returned a NULL pmModel\n");
    127127        testStatus = false;
    128128    } else {
    … …  
    146146    tmpModel = pmModelAlloc(PS_MODEL_PGAUSS);
    147147    if (tmpModel == NULL) {
    148         printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) returned a NULL psModel\n");
     148        printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) returned a NULL pmModel\n");
    149149        testStatus = false;
    150150    } else {
    … …  
    168168    tmpModel = pmModelAlloc(PS_MODEL_TWIST_GAUSS);
    169169    if (tmpModel == NULL) {
    170         printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) returned a NULL psModel\n");
     170        printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) returned a NULL pmModel\n");
    171171        testStatus = false;
    172172    } else {
    … …  
    190190    tmpModel = pmModelAlloc(PS_MODEL_WAUSS);
    191191    if (tmpModel == NULL) {
    192         printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) returned a NULL psModel\n");
     192        printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) returned a NULL pmModel\n");
    193193        testStatus = false;
    194194    } else {
    … …  
    212212    tmpModel = pmModelAlloc(PS_MODEL_SERSIC);
    213213    if (tmpModel == NULL) {
    214         printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) returned a NULL psModel\n");
     214        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) returned a NULL pmModel\n");
    215215        testStatus = false;
    216216    } else {
    … …  
    234234    tmpModel = pmModelAlloc(PS_MODEL_SERSIC_CORE);
    235235    if (tmpModel == NULL) {
    236         printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) returned a NULL psModel\n");
     236        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) returned a NULL pmModel\n");
    237237        testStatus = false;
    238238    } else {
    … …  
    253253    psFree(tmpModel);
    254254
    255     psSource *tmpSource = pmSourceAlloc();
     255    pmSource *tmpSource = pmSourceAlloc();
    256256    if (tmpSource == NULL) {
    257         printf("TEST ERROR: pmSourceAlloc() returned a NULL psSource\n");
     257        printf("TEST ERROR: pmSourceAlloc() returned a NULL pmSource\n");
    258258        testStatus = false;
    259259    }
    … …  
    545545        // HEY: verify
    546546        for (psS32 i = 0 ; i < outData->n ; i++) {
    547             psPeak *tmpPeak = (psPeak *) outData->data[i];
     547            pmPeak *tmpPeak = (pmPeak *) outData->data[i];
    548548            if (((tmpPeak->x == 0) && (tmpPeak->y == 0)) ||
    549549                    ((tmpPeak->x == 0) && (tmpPeak->y == numRows-1)) ||
    … …  
    803803        }
    804804    }
    805     psSource *rc = NULL;
    806     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
     805    pmSource *rc = NULL;
     806    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
    807807                                  (psF32) (TST04_NUM_COLS / 2),
    808808                                  200.0,
    … …  
    813813    rc = pmSourceLocalSky(NULL, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    814814    if (rc != NULL) {
    815         printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     815        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    816816        psFree(rc);
    817817        testStatus = false;
    … …  
    822822    rc = pmSourceLocalSky(imgDataF64, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    823823    if (rc != NULL) {
    824         printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     824        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    825825        psFree(rc);
    826826        testStatus = false;
    … …  
    828828
    829829    printf("----------------------------------------------------------------------------------\n");
    830     printf("Calling pmSourceLocalSky with NULL psPeak.  Should generate error and return NULL.\n");
     830    printf("Calling pmSourceLocalSky with NULL pmPeak.  Should generate error and return NULL.\n");
    831831    rc = pmSourceLocalSky(imgData, NULL, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    832832    if (rc != NULL) {
    833         printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     833        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    834834        psFree(rc);
    835835        testStatus = false;
    … …  
    840840    rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, -10.0, 20.0);
    841841    if (rc != NULL) {
    842         printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     842        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    843843        psFree(rc);
    844844        testStatus = false;
    … …  
    849849    rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 5.0);
    850850    if (rc != NULL) {
    851         printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     851        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    852852        psFree(rc);
    853853        testStatus = false;
    … …  
    861861        rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    862862        if (rc != NULL) {
    863             printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     863            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    864864            psFree(rc);
    865865            testStatus = false;
    … …  
    872872        rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    873873        if (rc != NULL) {
    874             printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     874            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    875875            psFree(rc);
    876876            testStatus = false;
    … …  
    883883        rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
    884884        if (rc != NULL) {
    885             printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     885            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    886886            psFree(rc);
    887887            testStatus = false;
    … …  
    894894        rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, (psF32) TST04_INNER_RADIUS, (psF32) TST04_OUTER_RADIUS);
    895895        if (rc != NULL) {
    896             printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
     896            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
    897897            psFree(rc);
    898898            testStatus = false;
    … …  
    915915
    916916    if (rc == NULL) {
    917         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
     917        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    918918        testStatus = false;
    919919    } else {
    920920        if (rc->peak == NULL) {
    921             printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource->peak.\n");
     921            printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource->peak.\n");
    922922            testStatus = false;
    923923        } else {
    924924            if (rc->peak->x != tmpPeak->x) {
    925                 printf("TEST ERROR: pmSourceLocalSky() psSource->peak->x was %d, should have been %d.\n", rc->peak->x, tmpPeak->x);
     925                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->x was %d, should have been %d.\n", rc->peak->x, tmpPeak->x);
    926926                testStatus = false;
    927927            }
    928928
    929929            if (rc->peak->y != tmpPeak->y) {
    930                 printf("TEST ERROR: pmSourceLocalSky() psSource->peak->y was %d, should have been %d.\n", rc->peak->y, tmpPeak->y);
     930                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->y was %d, should have been %d.\n", rc->peak->y, tmpPeak->y);
    931931                testStatus = false;
    932932            }
    933933
    934934            if (rc->peak->counts != tmpPeak->counts) {
    935                 printf("TEST ERROR: pmSourceLocalSky() psSource->peak->counts was %f, should have been %f.\n", rc->peak->counts, tmpPeak->counts);
     935                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->counts was %f, should have been %f.\n", rc->peak->counts, tmpPeak->counts);
    936936                testStatus = false;
    937937            }
    938938
    939939            if (rc->peak->class != tmpPeak->class) {
    940                 printf("TEST ERROR: pmSourceLocalSky() psSource->peak->class was %d, should have been %d.\n", rc->peak->class, tmpPeak->class);
     940                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->class was %d, should have been %d.\n", rc->peak->class, tmpPeak->class);
    941941                testStatus = false;
    942942            }
    … …  
    944944
    945945        if (rc->pixels == NULL) {
    946             printf("TEST ERROR: pmSourceLocalSky() psSource->pixels was NULL.\n");
     946            printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels was NULL.\n");
    947947            testStatus = false;
    948948        } else {
    949949            if (rc->pixels->numRows != (2 * TST04_OUTER_RADIUS)) {
    950                 printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->numRows was %d, should have been %d.\n",
     950                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->numRows was %d, should have been %d.\n",
    951951                       rc->pixels->numRows, (2 * TST04_OUTER_RADIUS));
    952952                testStatus = false;
    … …  
    954954
    955955            if (rc->pixels->numCols != (2 * TST04_OUTER_RADIUS)) {
    956                 printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->numCols was %d, should have been %d.\n",
     956                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->numCols was %d, should have been %d.\n",
    957957                       rc->pixels->numCols, (2 * TST04_OUTER_RADIUS));
    958958                testStatus = false;
    … …  
    960960
    961961            if (rc->pixels->col0 != (tmpPeak->x - TST04_OUTER_RADIUS)) {
    962                 printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->col0 was %d, should have been %d.\n",
     962                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->col0 was %d, should have been %d.\n",
    963963                       rc->pixels->col0, (tmpPeak->x - TST04_OUTER_RADIUS));
    964964                testStatus = false;
    … …  
    966966
    967967            if (rc->pixels->row0 != (tmpPeak->y - TST04_OUTER_RADIUS)) {
    968                 printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->row0 was %d, should have been %d.\n",
     968                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->row0 was %d, should have been %d.\n",
    969969                       rc->pixels->row0, (tmpPeak->y - TST04_OUTER_RADIUS));
    970970                testStatus = false;
    … …  
    972972
    973973            if (rc->pixels->type.type != PS_TYPE_F32) {
    974                 printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->type was %d, should have been %d.\n",
     974                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->type was %d, should have been %d.\n",
    975975                       rc->pixels->type.type, PS_TYPE_F32);
    976976                testStatus = false;
    … …  
    982982
    983983        if (rc->mask == NULL) {
    984             printf("TEST ERROR: pmSourceLocalSky() psSource->mask was NULL.\n");
     984            printf("TEST ERROR: pmSourceLocalSky() pmSource->mask was NULL.\n");
    985985            testStatus = false;
    986986        } else {
    987987            if (rc->mask->numRows != (2 * TST04_OUTER_RADIUS)) {
    988                 printf("TEST ERROR: pmSourceLocalSky() psSource->mask->numRows was %d, should have been %d.\n",
     988                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->numRows was %d, should have been %d.\n",
    989989                       rc->mask->numRows, (2 * TST04_OUTER_RADIUS));
    990990                testStatus = false;
    … …  
    992992
    993993            if (rc->mask->numCols != (2 * TST04_OUTER_RADIUS)) {
    994                 printf("TEST ERROR: pmSourceLocalSky() psSource->mask->numCols was %d, should have been %d.\n",
     994                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->numCols was %d, should have been %d.\n",
    995995                       rc->mask->numCols, (2 * TST04_OUTER_RADIUS));
    996996                testStatus = false;
    … …  
    998998
    999999            if (rc->mask->type.type != PS_TYPE_U8) {
    1000                 printf("TEST ERROR: pmSourceLocalSky() psSource->mask->type was %d, should have been %d.\n",
     1000                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->type was %d, should have been %d.\n",
    10011001                       rc->mask->type.type, PS_TYPE_U8);
    10021002                testStatus = false;
    … …  
    10181018            }
    10191019            if (maskedPixels != PS_SQR(2*(TST04_INNER_RADIUS-1))) {
    1020                 printf("TEST ERROR: pmSourceLocalSky() psSource->mask had %d masked pixels, should have been %d.\n",
     1020                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask had %d masked pixels, should have been %d.\n",
    10211021                       maskedPixels, PS_SQR(2*(TST04_INNER_RADIUS-1)));
    10221022                testStatus = false;
    10231023            }
    10241024            if (unmaskedPixels != (PS_SQR(2*TST04_OUTER_RADIUS) - PS_SQR(2*(TST04_INNER_RADIUS-1)))) {
    1025                 printf("TEST ERROR: pmSourceLocalSky() psSource->mask had %d masked pixels, should have been %d.\n",
     1025                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask had %d masked pixels, should have been %d.\n",
    10261026                       unmaskedPixels, (PS_SQR(2*TST04_OUTER_RADIUS) - PS_SQR(2*(TST04_INNER_RADIUS-1))));
    10271027                testStatus = false;
    … …  
    10301030
    10311031        if (rc->moments == NULL) {
    1032             printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource->moments.\n");
     1032            printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource->moments.\n");
    10331033            testStatus = false;
    10341034        } else {
    10351035            if (rc->moments->Sky != TST04_SKY) {
    1036                 printf("TEST ERROR: pmSourceLocalSky() psSource->moments->Sky was %f, should have been %f.\n", rc->moments->Sky, TST04_SKY);
     1036                printf("TEST ERROR: pmSourceLocalSky() pmSource->moments->Sky was %f, should have been %f.\n", rc->moments->Sky, TST04_SKY);
    10371037                testStatus = false;
    10381038            }
    … …  
    10631063{
    10641064    bool testStatus = true;
    1065     psSource *tmpSource = NULL;
     1065    pmSource *tmpSource = NULL;
    10661066    bool rc = false;
    10671067    // Create the image used in this test.
    … …  
    10801080
    10811081    //
    1082     // Create a psPeak with the center pixel set to the peak.
    1083     //
    1084     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST06_NUM_ROWS / 2),
     1082    // Create a pmPeak with the center pixel set to the peak.
     1083    //
     1084    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST06_NUM_ROWS / 2),
    10851085                                  (psF32) (TST06_NUM_COLS / 2),
    10861086                                  200.0,
    … …  
    10931093                                 (psF32) TST06_OUTER_RADIUS);
    10941094    if (tmpSource == NULL) {
    1095         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
     1095        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    10961096        psFree(imgData);
    10971097        psFree(imgDataF64);
    … …  
    11021102
    11031103    printf("----------------------------------------------------------------------------------\n");
    1104     printf("Calling pmSourceSetPixelsCircle with NULL psSource.  Should generate error and return NULL.\n");
     1104    printf("Calling pmSourceSetPixelsCircle with NULL pmSource.  Should generate error and return NULL.\n");
    11051105    rc = pmSourceSetPixelsCircle(NULL, imgData, 10.0);
    11061106    if (rc == true) {
    … …  
    11081108        testStatus = false;
    11091109    }
    1110     // XXX: test with psSource->peaks NULL
     1110    // XXX: test with pmSource->peaks NULL
    11111111
    11121112    printf("----------------------------------------------------------------------------------\n");
    … …  
    12181218{
    12191219    bool testStatus = true;
    1220     psSource *tmpSource = NULL;
    1221     psSource *rc = NULL;
     1220    pmSource *tmpSource = NULL;
     1221    pmSource *rc = NULL;
    12221222    // Create the image used in this test.
    12231223    psImage *imgData = psImageAlloc(TST05_NUM_COLS, TST05_NUM_ROWS, PS_TYPE_F32);
    … …  
    12291229
    12301230    //
    1231     // Create a psPeak with the center pixel set to the peak.
    1232     //
    1233     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST05_NUM_ROWS / 2),
     1231    // Create a pmPeak with the center pixel set to the peak.
     1232    //
     1233    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST05_NUM_ROWS / 2),
    12341234                                  (psF32) (TST05_NUM_COLS / 2),
    12351235                                  200.0,
    … …  
    12421242                                 (psF32) TST05_OUTER_RADIUS);
    12431243    if (tmpSource == NULL) {
    1244         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
     1244        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    12451245        psFree(tmpSource);
    12461246        testStatus = false;
    … …  
    12491249
    12501250    printf("----------------------------------------------------------------------------------\n");
    1251     printf("Calling pmSourceMoments with NULL psSource.  Should generate error and return NULL.\n");
     1251    printf("Calling pmSourceMoments with NULL pmSource.  Should generate error and return NULL.\n");
    12521252    rc = pmSourceMoments(NULL, 10.0);
    12531253    if (rc != NULL) {
    1254         printf("TEST ERROR: pmSourceMoments() returned a non-NULL psSource.\n");
    1255         testStatus = false;
    1256     }
    1257     // XXX: test with psSource->peaks NULL
    1258     // XXX: test with psSource->pixels NULL
    1259     // XXX: test with psSource->mask NULL
     1254        printf("TEST ERROR: pmSourceMoments() returned a non-NULL pmSource.\n");
     1255        testStatus = false;
     1256    }
     1257    // XXX: test with pmSource->peaks NULL
     1258    // XXX: test with pmSource->pixels NULL
     1259    // XXX: test with pmSource->mask NULL
    12601260
    12611261    printf("----------------------------------------------------------------------------------\n");
    … …  
    12631263    rc = pmSourceMoments(tmpSource, -10.0);
    12641264    if (rc != NULL) {
    1265         printf("TEST ERROR: pmSourceMoments() returned a non-NULL psSource.\n");
     1265        printf("TEST ERROR: pmSourceMoments() returned a non-NULL pmSource.\n");
    12661266        testStatus = false;
    12671267    }
    … …  
    14851485        }
    14861486    }
    1487     psSource *mySrc = NULL;
     1487    pmSource *mySrc = NULL;
    14881488    bool rc = false;
    1489     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
     1489    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
    14901490                                  (psF32) (TST04_NUM_COLS / 2),
    14911491                                  200.0,
    … …  
    15021502
    15031503    if (mySrc == NULL) {
    1504         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
    1505         testStatus = false;
    1506     }
    1507 
    1508     printf("----------------------------------------------------------------------------------\n");
    1509     printf("Calling pmSourceModelGuess with NULL psSource.  Should generate error, return FALSE.\n");
     1504        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
     1505        testStatus = false;
     1506    }
     1507
     1508    printf("----------------------------------------------------------------------------------\n");
     1509    printf("Calling pmSourceModelGuess with NULL pmSource.  Should generate error, return FALSE.\n");
    15101510    rc = pmSourceModelGuess(NULL, imgData, PS_MODEL_GAUSS);
    15111511    if (rc == true) {
    … …  
    16061606        }
    16071607    }
    1608     psSource *mySrc = NULL;
     1608    pmSource *mySrc = NULL;
    16091609    psArray *rc = NULL;
    16101610
    1611     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST09_NUM_ROWS / 2),
     1611    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST09_NUM_ROWS / 2),
    16121612                                  (psF32) (TST09_NUM_COLS / 2),
    16131613                                  200.0,
    … …  
    16241624
    16251625    if (mySrc == NULL) {
    1626         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
     1626        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    16271627        testStatus = false;
    16281628    }
    … …  
    16351635
    16361636    printf("----------------------------------------------------------------------------------\n");
    1637     printf("Calling pmSourceContour with NULL psSource .  Should generate error, return NULL.\n");
     1637    printf("Calling pmSourceContour with NULL pmSource .  Should generate error, return NULL.\n");
    16381638    rc = pmSourceContour(NULL, imgData, LEVEL, PS_CONTOUR_CRUDE);
    16391639    if (rc != NULL) {
    … …  
    16601660        printf("Calling pmSourceContour with acceptable data.\n");
    16611661        printf("NOTE: must figure out the parameters for this test to be meaningful.\n");
    1662         mySrc->models->params->data.F32[0] = TST09_SKY;
    1663         mySrc->models->params->data.F32[1] = 15.0;
    1664         mySrc->models->params->data.F32[2] = (psF32) (TST09_NUM_ROWS / 2);
    1665         mySrc->models->params->data.F32[3] = (psF32) (TST09_NUM_COLS / 2);
    1666         mySrc->models->params->data.F32[4] = 2.0;
    1667         mySrc->models->params->data.F32[5] = 2.0;
    1668         mySrc->models->params->data.F32[6] = 2.0;
     1662        mySrc->modelPSF->params->data.F32[0] = TST09_SKY;
     1663        mySrc->modelPSF->params->data.F32[1] = 15.0;
     1664        mySrc->modelPSF->params->data.F32[2] = (psF32) (TST09_NUM_ROWS / 2);
     1665        mySrc->modelPSF->params->data.F32[3] = (psF32) (TST09_NUM_COLS / 2);
     1666        mySrc->modelPSF->params->data.F32[4] = 2.0;
     1667        mySrc->modelPSF->params->data.F32[5] = 2.0;
     1668        mySrc->modelPSF->params->data.F32[6] = 2.0;
    16691669        rc = pmSourceContour(mySrc, imgData, LEVEL, PS_CONTOUR_CRUDE);
    16701670        if (rc == NULL) {
    … …  
    17031703        }
    17041704    }
    1705     psSource *mySrc = NULL;
     1705    pmSource *mySrc = NULL;
    17061706    psBool rc = false;
    17071707
    1708     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST15_NUM_ROWS / 2),
     1708    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST15_NUM_ROWS / 2),
    17091709                                  (psF32) (TST15_NUM_COLS / 2),
    17101710                                  200.0,
    … …  
    17211721
    17221722    if (mySrc == NULL) {
    1723         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
    1724         testStatus = false;
    1725     }
    1726 
    1727     mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
    1728     mySrc->models->params->data.F32[0] = 5.0;
    1729     mySrc->models->params->data.F32[1] = 70.0;
    1730     mySrc->models->params->data.F32[2] = (psF32) (TST15_NUM_ROWS / 2);
    1731     mySrc->models->params->data.F32[3] = (psF32) (TST15_NUM_COLS / 2);
    1732     mySrc->models->params->data.F32[4] = 1.0;
    1733     mySrc->models->params->data.F32[5] = 1.0;
    1734     mySrc->models->params->data.F32[6] = 2.0;
     1723        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
     1724        testStatus = false;
     1725    }
     1726
     1727    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
     1728    mySrc->modelPSF->params->data.F32[0] = 5.0;
     1729    mySrc->modelPSF->params->data.F32[1] = 70.0;
     1730    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST15_NUM_ROWS / 2);
     1731    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST15_NUM_COLS / 2);
     1732    mySrc->modelPSF->params->data.F32[4] = 1.0;
     1733    mySrc->modelPSF->params->data.F32[5] = 1.0;
     1734    mySrc->modelPSF->params->data.F32[6] = 2.0;
    17351735
    17361736    printf("----------------------------------------------------------------------------------\n");
    … …  
    17831783        }
    17841784    }
    1785     psSource *mySrc = NULL;
     1785    pmSource *mySrc = NULL;
    17861786    psBool rc = false;
    17871787
    1788     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
     1788    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
    17891789                                  (psF32) (TST16_NUM_COLS / 2),
    17901790                                  200.0,
    … …  
    18011801
    18021802    if (mySrc == NULL) {
    1803         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
    1804         testStatus = false;
    1805     }
    1806 
    1807     mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
    1808     mySrc->models->params->data.F32[0] = 5.0;
    1809     mySrc->models->params->data.F32[1] = 70.0;
    1810     mySrc->models->params->data.F32[2] = (psF32) (TST16_NUM_ROWS / 2);
    1811     mySrc->models->params->data.F32[3] = (psF32) (TST16_NUM_COLS / 2);
    1812     mySrc->models->params->data.F32[4] = 1.0;
    1813     mySrc->models->params->data.F32[5] = 1.0;
    1814     mySrc->models->params->data.F32[6] = 2.0;
     1803        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
     1804        testStatus = false;
     1805    }
     1806
     1807    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
     1808    mySrc->modelPSF->params->data.F32[0] = 5.0;
     1809    mySrc->modelPSF->params->data.F32[1] = 70.0;
     1810    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST16_NUM_ROWS / 2);
     1811    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST16_NUM_COLS / 2);
     1812    mySrc->modelPSF->params->data.F32[4] = 1.0;
     1813    mySrc->modelPSF->params->data.F32[5] = 1.0;
     1814    mySrc->modelPSF->params->data.F32[6] = 2.0;
    18151815
    18161816    printf("----------------------------------------------------------------------------------\n");
    … …  
    18631863        }
    18641864    }
    1865     psSource *mySrc = NULL;
     1865    pmSource *mySrc = NULL;
    18661866    psBool rc = false;
    18671867
    1868     psPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
     1868    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
    18691869                                  (psF32) (TST20_NUM_COLS / 2),
    18701870                                  200.0,
    … …  
    18811881
    18821882    if (mySrc == NULL) {
    1883         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
    1884         testStatus = false;
    1885     }
    1886 
    1887     mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
    1888 
    1889 
    1890     mySrc->models->params->data.F32[0] = 5.0;
    1891     mySrc->models->params->data.F32[1] = 70.0;
    1892     mySrc->models->params->data.F32[2] = (psF32) (TST20_NUM_ROWS / 2);
    1893     mySrc->models->params->data.F32[3] = (psF32) (TST20_NUM_COLS / 2);
    1894     mySrc->models->params->data.F32[4] = 1.0;
    1895     mySrc->models->params->data.F32[5] = 1.0;
    1896     mySrc->models->params->data.F32[6] = 2.0;
     1883        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
     1884        testStatus = false;
     1885    }
     1886
     1887    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
     1888
     1889
     1890    mySrc->modelPSF->params->data.F32[0] = 5.0;
     1891    mySrc->modelPSF->params->data.F32[1] = 70.0;
     1892    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST20_NUM_ROWS / 2);
     1893    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST20_NUM_COLS / 2);
     1894    mySrc->modelPSF->params->data.F32[4] = 1.0;
     1895    mySrc->modelPSF->params->data.F32[5] = 1.0;
     1896    mySrc->modelPSF->params->data.F32[6] = 2.0;
    18971897
    18981898    printf("----------------------------------------------------------------------------------\n");
    … …  
    19051905
    19061906    printf("----------------------------------------------------------------------------------\n");
    1907     printf("Calling pmSourceFitModel with NULL psSource.  Should generate error, return FALSE.\n");
     1907    printf("Calling pmSourceFitModel with NULL pmSource.  Should generate error, return FALSE.\n");
    19081908    rc = pmSourceFitModel(NULL, imgData);
    19091909    if (rc == true) {
Note: See TracChangeset for help on using the changeset viewer.