IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1622


Ignore:
Timestamp:
Aug 25, 2004, 10:22:15 AM (22 years ago)
Author:
harman
Message:

Updated ReadHeader function

Location:
trunk/psLib/test
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1494 r1622  
    88*     Test C - Read named hdr from complex FITS file
    99*     Test D - Remove items with same name from all metadata
    10 *     Test E- Attempt to use null file descriptor
    11 *     Test F - Attempt to use two null inputs
    12 *     Test G - Attempt to use bad extNum/
    13 *     Test H - Attempt to use bad extNameTest
    14 *     Test I - Free psMetadataData
     10*     Test E - Attempt to use null file descriptor
     11*     Test F - Attempt to open nonexistant file
     12*     Test G - Attempt to use two null inputs
     13*     Test H - Attempt to use bad extNum
     14*     Test I - Attempt to use bad extNameTest
     15*     Test J - Free psMetadataData
    1516*
    1617*  @author  Ross Harman, MHPCC
    1718*
    18 *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
    19 *  @date  $Date: 2004-08-12 01:08:39 $
     19*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
     20*  @date  $Date: 2004-08-25 20:22:15 $
    2021*
    2122*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    117118int main(int argc, char* argv[])
    118119{
    119     int status = 0;
    120     char fitsErr[ 256 ];
    121120    psMetadata *metadata1 = NULL;
    122121    psMetadata *metadata2 = NULL;
    123122    psMetadata *metadata3 = NULL;
    124     fitsfile *fptr;
    125123
    126124
    … …  
    136134    */
    137135    printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
    138     fits_open_file(&fptr, "header_1.fits", READONLY, &status);
    139     fits_get_errstatus( status, fitsErr );
    140     status = 0;
    141     printf("FITS file open status: %s\n\n",fitsErr);
    142     metadata1 = psMetadataFReadHeader(metadata1, NULL, 1, fptr);
     136    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
    143137    printMetadata(metadata1);
    144138    printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
    … …  
    187181    */
    188182    printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file");
    189     fits_open_file(&fptr, "header_2.fits", READONLY, &status);
    190     fits_get_errstatus( status, fitsErr );
    191     status = 0;
    192     printf("FITS file open status: %s\n\n",fitsErr);
    193     metadata2 = psMetadataFReadHeader(metadata2, NULL, 2, fptr);
     183    metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits");
    194184    printMetadata(metadata2);
    195185    printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
    … …  
    198188    // Test C - Read named hdr from complex FITS file
    199189    printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
    200     fits_open_file(&fptr, "header_2.fits", READONLY, &status);
    201     fits_get_errstatus( status, fitsErr );
    202     status = 0;
    203     printf("FITS file open status: %s\n\n",fitsErr);
    204     metadata3 = psMetadataFReadHeader(metadata3, "MY_DATA_2", 0, fptr);
     190    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
    205191    printMetadata(metadata3);
    206192    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
    … …  
    215201
    216202
    217     // Test E - Attempt to use null file descriptor
    218     printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null file descriptor",
    219                             "Null FITS file descriptor not allowed", 0);
    220     psMetadataFReadHeader(NULL, NULL, 1, NULL);
    221     printFooter(stdout, "psMetadata", "Test E - Attempt to use null file descriptor", true);
    222 
    223 
    224     // Test F - Attempt to use two null inputs
    225     printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to use two null inputs",
     203    // Test E - Attempt to use null file filename
     204    printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null filename",
     205                            "Null fileName not allowed", 0);
     206    psMetadataReadHeader(NULL, NULL, 1, NULL);
     207    printFooter(stdout, "psMetadata", "Test E - Attempt to use null filename", true);
     208
     209
     210    // Test F - Attempt to open nonexistant file
     211    printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to open nonexistant file",
     212                            "FITS error while opening file: missing.dat...Couldn't close FITS file...", 0);
     213    psMetadataReadHeader(NULL, NULL, 1, "missing.dat");
     214    printFooter(stdout, "psMetadata", "Test F - Attempt to open nonexistant file", true);
     215
     216
     217    // Test G - Attempt to use two null inputs
     218    printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use two null inputs",
    226219                            "Null extName and extNum = 0 not allowed", 0);
    227     psMetadataFReadHeader(NULL, NULL, 0, fptr);
    228     printFooter(stdout, "psMetadata", "Test F - Attempt to use two null inputs", true);
    229 
    230 
    231     // Test G - Attempt to use bad extNum
    232     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use bad extNum",
     220    psMetadataReadHeader(NULL, NULL, 0, "header_2.fits");
     221    printFooter(stdout, "psMetadata", "Test G - Attempt to use two null inputs", true);
     222
     223
     224    // Test H - Attempt to use bad extNum
     225    printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
    233226                            "FITS error while locating header 22: tried to move past end of file", 0);
    234     psMetadataFReadHeader(metadata1, NULL, 22, fptr);
    235     printFooter(stdout, "psMetadata", "Test G - Attempt to use bad extNum", true);
    236 
    237 
    238     // Test H - Attempt to use bad extName
    239     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extName",
     227    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
     228    printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
     229
     230
     231    // Test I - Attempt to use bad extName
     232    printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
    240233                            "FITS error while locating header AARGH: illegal HDU number", 0);
    241     psMetadataFReadHeader(metadata1, "AARGH", 0, fptr);
    242     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extName", true);
    243 
    244 
    245     // Test I- Free psMetadata
    246     printPositiveTestHeader(stdout, "psMetadata", "Test I - Free psMetadata");
     234    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
     235    printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
     236
     237
     238    // Test J - Free psMetadata
     239    printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata");
    247240    psFree(metadata1);
    248241    psFree(metadata2);
    … …  
    254247        printf("ERROR: Found %d bad memory blocks\n", nBad);
    255248    }
    256     printFooter(stdout, "psMetadata", "Test I - Free psMetadata", true);
     249    printFooter(stdout, "psMetadata", "Test J - Free psMetadata", true);
    257250
    258251    return 0;

  • trunk/psLib/test/collections/tst_psMetadata_01.c

    r1494 r1622  
    88*     Test C - Read named hdr from complex FITS file
    99*     Test D - Remove items with same name from all metadata
    10 *     Test E- Attempt to use null file descriptor
    11 *     Test F - Attempt to use two null inputs
    12 *     Test G - Attempt to use bad extNum/
    13 *     Test H - Attempt to use bad extNameTest
    14 *     Test I - Free psMetadataData
     10*     Test E - Attempt to use null file descriptor
     11*     Test F - Attempt to open nonexistant file
     12*     Test G - Attempt to use two null inputs
     13*     Test H - Attempt to use bad extNum
     14*     Test I - Attempt to use bad extNameTest
     15*     Test J - Free psMetadataData
    1516*
    1617*  @author  Ross Harman, MHPCC
    1718*
    18 *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
    19 *  @date  $Date: 2004-08-12 01:08:39 $
     19*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
     20*  @date  $Date: 2004-08-25 20:22:15 $
    2021*
    2122*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    117118int main(int argc, char* argv[])
    118119{
    119     int status = 0;
    120     char fitsErr[ 256 ];
    121120    psMetadata *metadata1 = NULL;
    122121    psMetadata *metadata2 = NULL;
    123122    psMetadata *metadata3 = NULL;
    124     fitsfile *fptr;
    125123
    126124
    … …  
    136134    */
    137135    printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
    138     fits_open_file(&fptr, "header_1.fits", READONLY, &status);
    139     fits_get_errstatus( status, fitsErr );
    140     status = 0;
    141     printf("FITS file open status: %s\n\n",fitsErr);
    142     metadata1 = psMetadataFReadHeader(metadata1, NULL, 1, fptr);
     136    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
    143137    printMetadata(metadata1);
    144138    printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
    … …  
    187181    */
    188182    printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file");
    189     fits_open_file(&fptr, "header_2.fits", READONLY, &status);
    190     fits_get_errstatus( status, fitsErr );
    191     status = 0;
    192     printf("FITS file open status: %s\n\n",fitsErr);
    193     metadata2 = psMetadataFReadHeader(metadata2, NULL, 2, fptr);
     183    metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits");
    194184    printMetadata(metadata2);
    195185    printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
    … …  
    198188    // Test C - Read named hdr from complex FITS file
    199189    printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
    200     fits_open_file(&fptr, "header_2.fits", READONLY, &status);
    201     fits_get_errstatus( status, fitsErr );
    202     status = 0;
    203     printf("FITS file open status: %s\n\n",fitsErr);
    204     metadata3 = psMetadataFReadHeader(metadata3, "MY_DATA_2", 0, fptr);
     190    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
    205191    printMetadata(metadata3);
    206192    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
    … …  
    215201
    216202
    217     // Test E - Attempt to use null file descriptor
    218     printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null file descriptor",
    219                             "Null FITS file descriptor not allowed", 0);
    220     psMetadataFReadHeader(NULL, NULL, 1, NULL);
    221     printFooter(stdout, "psMetadata", "Test E - Attempt to use null file descriptor", true);
    222 
    223 
    224     // Test F - Attempt to use two null inputs
    225     printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to use two null inputs",
     203    // Test E - Attempt to use null file filename
     204    printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null filename",
     205                            "Null fileName not allowed", 0);
     206    psMetadataReadHeader(NULL, NULL, 1, NULL);
     207    printFooter(stdout, "psMetadata", "Test E - Attempt to use null filename", true);
     208
     209
     210    // Test F - Attempt to open nonexistant file
     211    printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to open nonexistant file",
     212                            "FITS error while opening file: missing.dat...Couldn't close FITS file...", 0);
     213    psMetadataReadHeader(NULL, NULL, 1, "missing.dat");
     214    printFooter(stdout, "psMetadata", "Test F - Attempt to open nonexistant file", true);
     215
     216
     217    // Test G - Attempt to use two null inputs
     218    printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use two null inputs",
    226219                            "Null extName and extNum = 0 not allowed", 0);
    227     psMetadataFReadHeader(NULL, NULL, 0, fptr);
    228     printFooter(stdout, "psMetadata", "Test F - Attempt to use two null inputs", true);
    229 
    230 
    231     // Test G - Attempt to use bad extNum
    232     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use bad extNum",
     220    psMetadataReadHeader(NULL, NULL, 0, "header_2.fits");
     221    printFooter(stdout, "psMetadata", "Test G - Attempt to use two null inputs", true);
     222
     223
     224    // Test H - Attempt to use bad extNum
     225    printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
    233226                            "FITS error while locating header 22: tried to move past end of file", 0);
    234     psMetadataFReadHeader(metadata1, NULL, 22, fptr);
    235     printFooter(stdout, "psMetadata", "Test G - Attempt to use bad extNum", true);
    236 
    237 
    238     // Test H - Attempt to use bad extName
    239     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extName",
     227    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
     228    printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
     229
     230
     231    // Test I - Attempt to use bad extName
     232    printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
    240233                            "FITS error while locating header AARGH: illegal HDU number", 0);
    241     psMetadataFReadHeader(metadata1, "AARGH", 0, fptr);
    242     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extName", true);
    243 
    244 
    245     // Test I- Free psMetadata
    246     printPositiveTestHeader(stdout, "psMetadata", "Test I - Free psMetadata");
     234    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
     235    printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
     236
     237
     238    // Test J - Free psMetadata
     239    printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata");
    247240    psFree(metadata1);
    248241    psFree(metadata2);
    … …  
    254247        printf("ERROR: Found %d bad memory blocks\n", nBad);
    255248    }
    256     printFooter(stdout, "psMetadata", "Test I - Free psMetadata", true);
     249    printFooter(stdout, "psMetadata", "Test J - Free psMetadata", true);
    257250
    258251    return 0;
Note: See TracChangeset for help on using the changeset viewer.