IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3638


Ignore:
Timestamp:
Apr 1, 2005, 12:22:17 PM (21 years ago)
Author:
desonia
Message:

merged changes that were made on rel5 branch.

Location:
trunk/psLib
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/Makefile.am

    r3601 r3638  
    3030
    3131CLEANFILES = $(prefix)/docs/pslib/*
     32
     33test: check

  • trunk/psLib/pslib.kdevses

    r3495 r3638  
    22<!DOCTYPE KDevPrjSession>
    33<KDevPrjSession>
    4  <DocsAndViews NumberOfDocuments="5" >
     4 <DocsAndViews NumberOfDocuments="9" >
    55  <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/fileUtils/psFits.h" >
    66   <View0 line="220" Type="Source" />
    77  </Doc0>
    8   <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/fileUtils/psFits.c" >
    9    <View0 line="1654" Type="Source" />
     8  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/collections/Makefile.am" >
     9   <View0 line="60" Type="Source" />
    1010  </Doc1>
    11   <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/fileUtils/tst_psFits.c" >
    12    <View0 line="1177" Type="Source" />
     11  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/dataManip/Makefile.am" >
     12   <View0 line="116" Type="Source" />
    1313  </Doc2>
    14   <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/include/psMetadata.h" >
    15    <View0 line="299" Type="Source" />
     14  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/astronomy/Makefile.am" >
     15   <View0 line="108" Type="Source" />
    1616  </Doc3>
    17   <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/configure.ac" >
    18    <View0 line="67" Type="Source" />
     17  <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/fileUtils/Makefile.am" >
     18   <View0 line="38" Type="Source" />
    1919  </Doc4>
     20  <Doc5 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/Makefile.am" >
     21   <View0 line="32" Type="Source" />
     22  </Doc5>
     23  <Doc6 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/Makefile.am" >
     24   <View0 line="8" Type="Source" />
     25  </Doc6>
     26  <Doc7 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/image/Makefile.am" >
     27   <View0 line="62" Type="Source" />
     28  </Doc7>
     29  <Doc8 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/sysUtils/Makefile.am" >
     30   <View0 line="44" Type="Source" />
     31  </Doc8>
    2032 </DocsAndViews>
    2133 <pluginList>

  • trunk/psLib/test/Makefile.am

    r3115 r3638  
    77EXTRA_DIST = runTest FullUnitTest
    88
    9 tests:
    10 
     9test: check

  • trunk/psLib/test/astronomy/Makefile.am

    r3569 r3638  
    7878        verified
    7979
    80 CLEANFILES = $(TESTS) $(check_DATA)
     80CLEANFILES = $(TESTS) $(check_DATA) temp/*
    8181
    8282psTime.config: $(top_srcdir)/etc/pslib/psTime.config.template
    … …  
    107107        cp $? $@
    108108
     109test: check
    109110
     111

  • trunk/psLib/test/astronomy/tst_psAstrometry01.c

    r3569 r3638  
    55*  @author GLG, MHPCC
    66*
    7 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    8 *  @date $Date: 2005-03-30 23:22:39 $
     7*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     8*  @date $Date: 2005-04-01 22:22:17 $
    99*
    1010* XXX: Must test
    … …  
    258258        for (j=0;j<X_NUM_COLS;j++) {
    259259            if ((tmp->x)[i][j] != x->data.F64[i][j]) {
    260                 printf("ERROR: (tmp->x)[%d][%d] is %f, should be %f\n", i, j,
     260                printf("ERROR: (tmp->x)[%d][%d] is %.2f, should be %.2f\n", i, j,
    261261                       (tmp->x)[i][j], x->data.F64[i][j]);
    262262                testStatus = 1;
    … …  
    274274        for (j=0;j<Y_NUM_COLS;j++) {
    275275            if ((tmp->y)[i][j] != y->data.F64[i][j]) {
    276                 printf("ERROR: (tmp->y)[%d][%d] is %f, should be %f\n", i, j,
     276                printf("ERROR: (tmp->y)[%d][%d] is %.2f, should be %.2f\n", i, j,
    277277                       (tmp->y)[i][j], y->data.F64[i][j]);
    278278
    … …  
    292292    }
    293293    if (tmp->x0 != X0) {
    294         printf("ERROR: tmp->x0 is %f, should be %f\n", tmp->x0, X0);
     294        printf("ERROR: tmp->x0 is %.2f, should be %.2f\n", tmp->x0, X0);
    295295        testStatus = 1;
    296296    }
    297297    if (tmp->xScale != X_SCALE) {
    298         printf("ERROR: tmp->xScale is %f, should be %f\n", tmp->xScale, X_SCALE);
     298        printf("ERROR: tmp->xScale is %.2f, should be %.2f\n", tmp->xScale, X_SCALE);
    299299        testStatus = 1;
    300300    }
    … …  
    306306    }
    307307    if (tmp->y0 != Y0) {
    308         printf("ERROR: tmp->y0 is %f, should be %f\n", tmp->y0, Y0);
     308        printf("ERROR: tmp->y0 is %.2f, should be %.2f\n", tmp->y0, Y0);
    309309        testStatus = 1;
    310310    }
    311311    if (tmp->yScale != Y_SCALE) {
    312         printf("ERROR: tmp->yScale is %f, should be %f\n", tmp->yScale, Y_SCALE);
     312        printf("ERROR: tmp->yScale is %.2f, should be %.2f\n", tmp->yScale, Y_SCALE);
    313313        testStatus = 1;
    314314    }
    … …  
    336336
    337337    if (grom->height != HEIGHT) {
    338         printf("ERROR: grom->height is %f, should be %f\n", grom->height, HEIGHT);
     338        printf("ERROR: grom->height is %.2f, should be %.2f\n", grom->height, HEIGHT);
    339339        testStatus = 1;
    340340    }
    341341    if (grom->temperature != TEMPERATURE) {
    342         printf("ERROR: grom->temperature is %f, should be %f\n", grom->temperature, TEMPERATURE);
     342        printf("ERROR: grom->temperature is %.2f, should be %.2f\n", grom->temperature, TEMPERATURE);
    343343        testStatus = 2;
    344344    }
    345345
    346346    if (grom->pressure != PRESSURE) {
    347         printf("ERROR: grom->pressure is %f, should be %f\n", grom->pressure, PRESSURE);
     347        printf("ERROR: grom->pressure is %.2f, should be %.2f\n", grom->pressure, PRESSURE);
    348348        testStatus = 3;
    349349    }
    350350
    351351    if (grom->humidity != HUMIDITY) {
    352         printf("ERROR: grom->humidity is %f, should be %f\n", grom->humidity, HUMIDITY);
     352        printf("ERROR: grom->humidity is %.2f, should be %.2f\n", grom->humidity, HUMIDITY);
    353353        testStatus = 4;
    354354    }
    355355
    356356    if (grom->wavelength != WAVELENGTH) {
    357         printf("ERROR: grom->wavelength is %f, should be %f\n", grom->wavelength, WAVELENGTH);
     357        printf("ERROR: grom->wavelength is %.2f, should be %.2f\n", grom->wavelength, WAVELENGTH);
    358358        testStatus = 5;
    359359    }
    360360
    361361    if (grom->lapseRate != LAPSERATE) {
    362         printf("ERROR: grom->lapseRate is %f, should be %f\n", grom->lapseRate, LAPSERATE);
     362        printf("ERROR: grom->lapseRate is %.2f, should be %.2f\n", grom->lapseRate, LAPSERATE);
    363363        testStatus = 6;
    364364    }
    … …  
    369369
    370370       if (grom-> != ) {
    371             printf("ERROR: grom-> is %f, should be %f\n", grom->, );
     371            printf("ERROR: grom-> is %.2f, should be %.2f\n", grom->, );
    372372            testStatus = 1;
    373373       }
    374374    */
    375375
    376     printf("grom->latitude is %f\n", grom->latitude);
    377     printf("grom->sinLat is %f\n", grom->sinLat);
    378     printf("grom->cosLat is %f\n", grom->cosLat);
    379     printf("grom->abberationMag is %f\n", grom->abberationMag);
    380     printf("grom->height is %f\n", grom->height);
    381     printf("grom->temperature is %f\n", grom->temperature);
    382     printf("grom->pressure is %f\n", grom->pressure);
    383     printf("grom->humidity is %f\n", grom->humidity);
    384     printf("grom->wavelength is %f\n", grom->wavelength);
    385     printf("grom->lapseRate is %f\n", grom->lapseRate);
    386     printf("grom->refractA is %f\n", grom->refractA);
    387     printf("grom->refractB is %f\n", grom->refractB);
    388     printf("grom->longitudeOffset is %f\n", grom->longitudeOffset);
    389     // printf("grom->siderealTime is %f\n", grom->siderealTime);
     376    printf("grom->latitude is %.2f\n", grom->latitude);
     377    printf("grom->sinLat is %.2f\n", grom->sinLat);
     378    printf("grom->cosLat is %.2f\n", grom->cosLat);
     379    printf("grom->abberationMag is %.2f\n", grom->abberationMag);
     380    printf("grom->height is %.2f\n", grom->height);
     381    printf("grom->temperature is %.2f\n", grom->temperature);
     382    printf("grom->pressure is %.2f\n", grom->pressure);
     383    printf("grom->humidity is %.2f\n", grom->humidity);
     384    printf("grom->wavelength is %.2f\n", grom->wavelength);
     385    printf("grom->lapseRate is %.2f\n", grom->lapseRate);
     386    printf("grom->refractA is %.2f\n", grom->refractA);
     387    printf("grom->refractB is %.2f\n", grom->refractB);
     388    printf("grom->longitudeOffset is %.2f\n", grom->longitudeOffset);
     389    // printf("grom->siderealTime is %.2f\n", grom->siderealTime);
    390390
    391391    psFree(now);
    … …  
    461461                    fpaCoord.x = (double) xFPA;
    462462                    fpaCoord.y = (double) y;
    463                     //printf("------------------ (%f, %f) ------------------\n", fpaCoord.x, fpaCoord.y);
     463                    //printf("------------------ (%.2f, %.2f) ------------------\n", fpaCoord.x, fpaCoord.y);
    464464                    psChip* tmpChip = psChipInFPA(&fpaCoord, myFPA);
    465465                    myCell = psCellInFPA(&fpaCoord, myFPA);
    … …  
    477477
    478478                        if (x != (psS32) cellCoord.x) {
    479                             printf("ERROR: x coord was %f, should be %d\n", cellCoord.x, x);
     479                            printf("ERROR: x coord was %.2f, should be %d\n", cellCoord.x, x);
    480480                        }
    481481                        if (y != (psS32) cellCoord.y) {
    482                             printf("ERROR: y coord was %f, should be %d\n", cellCoord.y, y);
     482                            printf("ERROR: y coord was %.2f, should be %d\n", cellCoord.y, y);
    483483                        }
    484484
    485485                        psCoordCellToChip(&testCoord, &cellCoord, myCell);
    486486                        if (testCoord.x != chipCoord.x) {
    487                             printf("ERROR: psCoordCellToChip() x coord was %f, should be %d\n", cellCoord.x, x);
     487                            printf("ERROR: psCoordCellToChip() x coord was %.2f, should be %d\n", cellCoord.x, x);
    488488                        }
    489489                        if (testCoord.y != chipCoord.y) {
    490                             printf("ERROR: psCoordCellToChip() y coord was %f, should be %d\n", cellCoord.y, y);
     490                            printf("ERROR: psCoordCellToChip() y coord was %.2f, should be %d\n", cellCoord.y, y);
    491491                        }
    492492
    … …  
    501501                        psCoordChipToFPA(&testCoord, &chipCoord, tmpChip);
    502502                        if (testCoord.x != xFPA) {
    503                             printf("ERROR: psCoordChipToFPA() x coord was %f, should be %d\n", cellCoord.x, x);
     503                            printf("ERROR: psCoordChipToFPA() x coord was %.2f, should be %d\n", cellCoord.x, x);
    504504                        }
    505505                        if (testCoord.y != y) {
    506                             printf("ERROR: psCoordChipToFPA() y coord was %f, should be %d\n", cellCoord.y, y);
     506                            printf("ERROR: psCoordChipToFPA() y coord was %.2f, should be %d\n", cellCoord.y, y);
    507507                        }
    508508
    509509                        psCoordFPAToTP(&testCoord, &fpaCoord, 0.0, 0.0, myFPA);
    510510                        if (testCoord.x != fpaCoord.x) {
    511                             printf("ERROR: psCoordFPAToTP() x coord was %f, should be %d\n", cellCoord.x, x);
     511                            printf("ERROR: psCoordFPAToTP() x coord was %.2f, should be %d\n", cellCoord.x, x);
    512512                        }
    513513                        if (testCoord.y != fpaCoord.y) {
    514                             printf("ERROR: psCoordFPAToTP() y coord was %f, should be %d\n", cellCoord.y, y);
     514                            printf("ERROR: psCoordFPAToTP() y coord was %.2f, should be %d\n", cellCoord.y, y);
    515515                        }
    516516
    517517                        psCoordCellToFPA(&testCoord, &cellCoord, myCell);
    518518                        if (testCoord.x != fpaCoord.x) {
    519                             printf("ERROR: psCoordFPAToTP() x coord was %f, should be %d\n", cellCoord.x, x);
     519                            printf("ERROR: psCoordFPAToTP() x coord was %.2f, should be %d\n", cellCoord.x, x);
    520520                        }
    521521                        if (testCoord.y != fpaCoord.y) {
    522                             printf("ERROR: psCoordFPAToTP() y coord was %f, should be %d\n", cellCoord.y, y);
     522                            printf("ERROR: psCoordFPAToTP() y coord was %.2f, should be %d\n", cellCoord.y, y);
    523523                        }
    524524
    525525                        psCoordTPToFPA(&testCoord, &fpaCoord, 0.0, 0.0, myFPA);
    526526                        if (testCoord.x != fpaCoord.x) {
    527                             printf("ERROR: psCoordFPAToTP() x coord was %f, should be %d\n", cellCoord.x, x);
     527                            printf("ERROR: psCoordFPAToTP() x coord was %.2f, should be %d\n", cellCoord.x, x);
    528528                        }
    529529                        if (testCoord.y != fpaCoord.y) {
    530                             printf("ERROR: psCoordFPAToTP() y coord was %f, should be %d\n", cellCoord.y, y);
     530                            printf("ERROR: psCoordFPAToTP() y coord was %.2f, should be %d\n", cellCoord.y, y);
    531531                        }
    532532                    }

  • trunk/psLib/test/astronomy/verified/tst_psAstrometry01.stdout

    r3570 r3638  
    1 grom->latitude is 1.291152
    2 grom->sinLat is 0.961154
    3 grom->cosLat is 0.276013
    4 grom->abberationMag is 0.000000
    5 grom->height is 3055.000000
    6 grom->temperature is 7.000000
    7 grom->pressure is 8.000000
    8 grom->humidity is 20.000000
    9 grom->wavelength is 11.000000
    10 grom->lapseRate is 20.000000
    11 grom->refractA is 0.000018
    12 grom->refractB is -0.000000
    13 grom->longitudeOffset is 2.361888
     1grom->latitude is 1.29
     2grom->sinLat is 0.96
     3grom->cosLat is 0.28
     4grom->abberationMag is 0.00
     5grom->height is 3055.00
     6grom->temperature is 7.00
     7grom->pressure is 8.00
     8grom->humidity is 20.00
     9grom->wavelength is 11.00
     10grom->lapseRate is 20.00
     11grom->refractA is 0.00
     12grom->refractB is -0.00
     13grom->longitudeOffset is 2.36
    1414trans1: x = x+y, y = x+y
    1515-------------------- trans->x coeffs --------------------

  • trunk/psLib/test/collections/Makefile.am

    r3381 r3638  
    3333
    3434check_PROGRAMS =$(TESTS)
    35  
     35
     36check_DATA =
     37
    3638TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    3739
    38 CLEANFILES = $(TESTS) $(check_DATA)
     40CLEANFILES = $(TESTS) $(check_DATA) temp/*
    3941
    40 tests: $(TESTS)
     42tests: $(check_DATA) $(TESTS)
    4143
    4244tst_psVector_SOURCES = tst_psVector.c
    … …  
    5658tst_psScalar_SOURCES = tst_psScalar.c
    5759
     60test: check

  • trunk/psLib/test/dataIO/Makefile.am

    r3381 r3638  
    2525
    2626TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    27 tests: $(TESTS)
    2827
    29 CLEANFILES = $(TESTS) $(check_DATA)
     28tests: $(check_DATA) $(TESTS)
     29
     30CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/*
    3031
    3132tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
    … …  
    3536        cp $? $@
    3637
     38test: check

  • trunk/psLib/test/dataManip/Makefile.am

    r3406 r3638  
    6363check_PROGRAMS = $(TESTS)
    6464
    65 CLEANFILES = $(TESTS) $(check_DATA)
     65check_DATA =
     66
     67CLEANFILES = $(TESTS) $(check_DATA) temp/*
    6668
    6769TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    6870
    69 tests: $(TESTS)
     71tests: $(TESTS) $(check_DATA)
    7072
    7173tst_psFunc00_SOURCES =  tst_psFunc00.c
    … …  
    113115tst_psRandom_SOURCES =  tst_psRandom.c
    114116tst_psVectorFFT_SOURCES = tst_psVectorFFT.c
    115  
     117
     118test: check

  • trunk/psLib/test/fileUtils/Makefile.am

    r3381 r3638  
    2525
    2626TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    27 tests: $(TESTS)
    2827
    29 CLEANFILES = $(TESTS) $(check_DATA)
     28tests: $(check_DATA) $(TESTS)
     29
     30CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/*
    3031
    3132tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
    … …  
    3536        cp $? $@
    3637
     38test: check

  • trunk/psLib/test/image/Makefile.am

    r3381 r3638  
    3232        sBiOut.fits \
    3333        sOut.fits
    34                
     34
    3535TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    3636
    37 CLEANFILES = $(TESTS) $(check_DATA)
     37CLEANFILES = $(TESTS) $(check_DATA) temp/*
    3838
    39 tests: $(TESTS)
     39tests: $(check_DATA) $(TESTS)
    4040
    4141tst_psImage_SOURCES =  tst_psImage.c
    … …  
    5959sOut.fits: verified/sOut.fits
    6060        cp $? $@
    61                        
     61
     62test: check

  • trunk/psLib/test/sysUtils/Makefile.am

    r3381 r3638  
    2626check_PROGRAMS =$(TESTS)
    2727
     28check_DATA =
     29
    2830TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2931
    30 CLEANFILES = $(TESTS) $(check_DATA)
     32CLEANFILES = $(TESTS) $(check_DATA) temp/*
    3133
    32 tests: $(TESTS)
     34tests: $(check_DATA) $(TESTS)
    3335
    3436tst_psAbort_SOURCES =  tst_psAbort.c
    … …  
    4042tst_psConfigure_SOURCES =  tst_psConfigure.c
    4143
     44test: check
Note: See TracChangeset for help on using the changeset viewer.