IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3059


Ignore:
Timestamp:
Jan 18, 2005, 4:17:05 PM (22 years ago)
Author:
desonia
Message:

* empty log message *

Files:
9 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • branches/rel4/psLib/psLib.kdevses

    r3025 r3059  
    22<!DOCTYPE KDevPrjSession>
    33<KDevPrjSession>
    4  <DocsAndViews NumberOfDocuments="8" >
     4 <DocsAndViews NumberOfDocuments="6" >
    55  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/test/fileUtils/tst_psFits.c" >
    6    <View0 Type="Source" />
     6   <View0 line="96" Type="Source" />
    77  </Doc0>
    88  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/src/fileUtils/psFits.h" >
    … …  
    1010  </Doc1>
    1111  <Doc2 NumberOfViews="1" URL="file:/home/desonia/psLib/src/fileUtils/psFits.c" >
    12    <View0 Type="Source" />
     12   <View0 line="1217" Type="Source" />
    1313  </Doc2>
    14   <Doc3 NumberOfViews="1" URL="file:/home/desonia/psLib/src/image/psImage.h" >
    15    <View0 Type="Source" />
     14  <Doc3 NumberOfViews="1" URL="file:/home/desonia/psLib/src/mainpage.dox" >
     15   <View0 line="95" Type="Source" />
    1616  </Doc3>
    17   <Doc4 NumberOfViews="1" URL="file:/home/desonia/psLib/src/image/psImageIO.c" >
    18    <View0 Type="Source" />
     17  <Doc4 NumberOfViews="1" URL="file:/home/desonia/psLib/src/Makefile.Globals" >
     18   <View0 line="43" Type="Source" />
    1919  </Doc4>
    20   <Doc5 NumberOfViews="1" URL="file:/home/desonia/psLib/src/fileUtils/psFileUtilsErrors.dat" >
    21    <View0 Type="Source" />
     20  <Doc5 NumberOfViews="1" URL="file:/home/desonia/psLib/src/Doxyfile" >
     21   <View0 line="25" Type="Source" />
    2222  </Doc5>
    23   <Doc6 NumberOfViews="1" URL="file:/home/desonia/psLib/src/image/psImageErrors.dat" >
    24    <View0 Type="Source" />
    25   </Doc6>
    26   <Doc7 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psLogMsg.h" >
    27    <View0 line="36" Type="Source" />
    28   </Doc7>
    2923 </DocsAndViews>
    3024 <pluginList>

  • branches/rel4/psLib/src/Makefile

    r2681 r3059  
    33##  Makefile:  psLib
    44##
    5 ##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-12-10 02:50:14 $
     5##  $Revision: 1.19.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2005-01-19 02:17:04 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454
    5555all:    $(ALLTARGETS)
     56        sed 's|PREFIX|$(prefix)|' $(TIME_CONFIG_FILE).template > $(TIME_CONFIG_FILE)
    5657        $(BUILD_DYNAMIC1) $(TARGET_STATIC) $(BUILD_DYNAMIC2) $(TARGET_DYNAMIC)
    5758        @echo ""
    … …  
    199200        install *.h $(includedir)
    200201        install $(TARGET_STATIC) $(libexecdir)
     202        install $(TARGET_DYNAMIC) $(libexecdir)
    201203        install $(TARGET_DYNAMIC) $(libexecdir)
    202204

  • branches/rel4/psLib/src/Makefile.Globals

    r2879 r3059  
    66##  Assumptions:    Variable "prefix" already defined
    77##
    8 ##  $Revision: 1.38 $  $Name: not supported by cvs2svn $
    9 ##  $Date: 2005-01-04 02:34:56 $
     8##  $Revision: 1.38.2.1 $  $Name: not supported by cvs2svn $
     9##  $Date: 2005-01-19 02:17:04 $
    1010##
    1111##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4343ifndef TIME_CONFIG_FILE
    4444    export TIME_CONFIG_FILE = $(prefix)/config/psTime.config
     45endif
     46
     47ifndef TIME_XML_FILE
     48    export TIME_XML_FILE = $(prefix)/config/psTime.xml
    4549endif
    4650

  • branches/rel4/psLib/test/astronomy/Makefile

    r2930 r3059  
    33##  Makefile:   test/astronomy
    44##
    5 ##  $Revision: 1.25 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2005-01-07 23:52:00 $
     5##  $Revision: 1.25.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2005-01-19 02:17:04 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616include ../../src/Makefile.Globals
    1717
    18 CFLAGS := -I../../include -I/usr/include/libxml $(CFLAGS)
     18CFLAGS := -I../../include \
     19  -DTIME_XML_FILE="\"$(TIME_XML_FILE)\"" \
     20  -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\"" \
     21  $(CFLAGS)
     22
    1923LDFLAGS := -L../../lib -lpslib -lpstest -lxml2 $(LDFLAGS)
    2024
    … …  
    3842
    3943all: $(TARGET)
     44        sed 's|PREFIX|$(prefix)|' test.psTime.config1.template > test.psTime.config1
     45        sed 's|PREFIX|$(prefix)|' test.psTime.config2.template > test.psTime.config2
     46        sed 's|PREFIX|$(prefix)|' test.psTime.config3.template > test.psTime.config3
     47        sed 's|PREFIX|$(prefix)|' test.psTime.config4.template > test.psTime.config4
    4048
    4149clean:
    … …  
    4957        install test.config header_1.fits header_2.fits $(TARGET) $(testbindir)
    5058        install verified/*.stderr verified/*.stdout $(testbindir)/verified
     59        install test.ser7.dat test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 $(testbindir)
    5160
    5261$(testbindir):

  • branches/rel4/psLib/test/astronomy/test.psTime.config1

    r2364 r3059  
    11# This configuration file specifies values required for time calculations by psLib.
    2 psLib.time.tables.dir STR ../../dataxz                                                    # Directory for time tables
     2psLib.time.tables.dir STR bogus                                                    # Directory for time tables
    33psLib.time.tables.n S32 4                                                               # Number of time tables
    44psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names

  • branches/rel4/psLib/test/astronomy/test.psTime.config2

    r2364 r3059  
    11# This configuration file specifies values required for time calculations by psLib.
    2 psLib.time.tables.dir STR ../../data                                                    # Directory for time tables
     2psLib.time.tables.dir STR /home/desonia/psLib/data                                                    # Directory for time tables
    33psLib.time.tables.n S32 4                                                               # Number of time tables
    44psLib.time.tables.files STR eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names

  • branches/rel4/psLib/test/astronomy/test.psTime.config3

    r2364 r3059  
    11# This configuration file specifies values required for time calculations by psLib.
    2 psLib.time.tables.dir STR ../../data                                                    # Directory for time tables
     2psLib.time.tables.dir STR /home/desonia/psLib/data                                                    # Directory for time tables
    33psLib.time.tables.n S32 4                                                               # Number of time tables
    44psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names

  • branches/rel4/psLib/test/astronomy/tst_psMetadata_07.c

    r2610 r3059  
    99*  @author  Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    12 *  @date  $Date: 2004-12-03 23:38:41 $
     11*  @version $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     12*  @date  $Date: 2005-01-19 02:17:04 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1717#include "pslib.h"
    1818#include "psTest.h"
     19
     20#ifndef TIME_XML_FILE
     21#define TIME_XML_FILE "../../config/psTime.xml"
     22#pragma warning TIME_XML_FILE was not defined in the makefile.
     23#endif
    1924
    2025
    … …  
    2631    psU32 nFail = 0;
    2732    psMetadata *md = NULL;
    28     md = psMetadataParseConfigXml(md, &nFail, "../../config/psTime.xml", true);
     33    md = psMetadataParseConfigXml(md, &nFail, TIME_XML_FILE, true);
    2934    if (nFail != 0) {
    3035        printf("psMetadataParseConfigXml returned error %d\n", res);

  • branches/rel4/psLib/test/astronomy/tst_psTime_04.c

    r2725 r3059  
    1414 *  @author  Ross Harman, MHPCC
    1515 *
    16  *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    17  *  @date  $Date: 2004-12-16 18:53:35 $
     16 *  @version $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     17 *  @date  $Date: 2005-01-19 02:17:04 $
    1818 *
    1919 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929    // Test A - Initialize time
    3030    printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time");
    31     psLibInit(true, "../../config/psTime.config");
     31    psLibInit(true, TIME_CONFIG_FILE);
    3232    psLibFinalize();
    3333    printFooter(stdout, "psTime", "Test A - Initialize time", true);

  • branches/rel4/psLib/test/astronomy/verified/tst_psTime_04.stderr

    r2726 r3059  
    44    Failed to initialize psTime.
    55<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
    6     Failed to open file ../../dataxz/ser7.dat.
     6    Failed to open file bogus/ser7.dat.
    77<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
    8     Failed to open file ../../dataxz/eopc01_1900_2004.dat.
     8    Failed to open file bogus/eopc01_1900_2004.dat.
    99<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
    10     Failed to open file ../../dataxz/finals_all.dat.
     10    Failed to open file bogus/finals_all.dat.
    1111<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
    12     Failed to open file ../../dataxz/tai_utc.dat.
     12    Failed to open file bogus/tai_utc.dat.
    1313<DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
    1414    Incorrect number of table files entered. Found: 3. Expected: 4.

  • branches/rel4/psLib/test/collections/tst_psMetadata_07.c

    r2611 r3059  
    99*  @author  Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    12 *  @date  $Date: 2004-12-03 23:38:41 $
     11*  @version $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     12*  @date  $Date: 2005-01-19 02:17:04 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1717#include "pslib.h"
    1818#include "psTest.h"
     19
     20#ifndef TIME_XML_FILE
     21#define TIME_XML_FILE "../../config/psTime.xml"
     22#pragma warning TIME_XML_FILE was not defined in the makefile.
     23#endif
    1924
    2025
    … …  
    2631    psU32 nFail = 0;
    2732    psMetadata *md = NULL;
    28     md = psMetadataParseConfigXml(md, &nFail, "../../config/psTime.xml", true);
     33    md = psMetadataParseConfigXml(md, &nFail, TIME_XML_FILE, true);
    2934    if (nFail != 0) {
    3035        printf("psMetadataParseConfigXml returned error %d\n", res);

  • branches/rel4/psLib/test/dataIO/Makefile

    r2962 r3059  
    33##  Makefile:   test/fileUtils
    44##
    5 ##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2005-01-12 22:17:02 $
     5##  $Revision: 1.2.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2005-01-19 02:17:05 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616include ../../src/Makefile.Globals
    1717
    18 CFLAGS := -I../../include $(CFLAGS)
     18CFLAGS := -I../../include -DUTC_DAT_FILE="\"$(prefix)/data/tai_utc.dat\"" $(CFLAGS)
    1919LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS)
    2020
    … …  
    3434
    3535install: $(testbindir) $(testbindir)/verified $(TARGET)
     36        install $(TARGET) $(testbindir)
    3637        install verified/*.stderr verified/*.stdout $(testbindir)/verified
    3738

  • branches/rel4/psLib/test/dataIO/tst_psLookupTable_01.c

    r2808 r3059  
    1212*  @author  Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    15 *  @date  $Date: 2004-12-23 19:38:38 $
     14*  @version $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     15*  @date  $Date: 2005-01-19 02:17:05 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636    psLookupTable* table1 = NULL;
    3737
    38     table1 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     38    table1 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    3939    table1 = psLookupTableRead(table1);
    4040    out1 = psLookupTableInterpolate(table1, index1, 0, &status1);
    … …  
    5656    psF64 truthData2[] = {31.5, 41317, 0};
    5757
    58     table2 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     58    table2 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    5959    table2 = psLookupTableRead(table2);
    6060    stats2 = psVectorAlloc(table2->numCols, PS_TYPE_U32);
    … …  
    7878    psLookupTable* table3 = NULL;
    7979
    80     table3 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     80    table3 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    8181    table3 = psLookupTableRead(table3);
    8282    out3 = psLookupTableInterpolate(table3, index3, 0, &status3);
    … …  
    9393    psLookupTable* table4 = NULL;
    9494
    95     table4 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     95    table4 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    9696    table4 = psLookupTableRead(table4);
    9797    out4 = psLookupTableInterpolate(table4, index4, 0, &status4);

  • branches/rel4/psLib/test/dataManip

    • Property svn:ignore

      •  

        old new  
        5454tst_psMinimize07
        5555tst_psRandom
         56seed_msglog1.txt
         57seed_msglog2.txt

  • branches/rel4/psLib/test/dataManip/.cvsignore

    r2837 r3059  
    5454tst_psMinimize07
    5555tst_psRandom
     56seed_msglog1.txt
     57seed_msglog2.txt

  • branches/rel4/psLib/test/fileUtils/Makefile

    r2962 r3059  
    33##  Makefile:   test/fileUtils
    44##
    5 ##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2005-01-12 22:17:02 $
     5##  $Revision: 1.2.2.1 $  $Name: not supported by cvs2svn $
     6##  $Date: 2005-01-19 02:17:05 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616include ../../src/Makefile.Globals
    1717
    18 CFLAGS := -I../../include $(CFLAGS)
     18CFLAGS := -I../../include -DUTC_DAT_FILE="\"$(prefix)/data/tai_utc.dat\"" $(CFLAGS)
    1919LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS)
    2020
    … …  
    3434
    3535install: $(testbindir) $(testbindir)/verified $(TARGET)
     36        install $(TARGET) $(testbindir)
    3637        install verified/*.stderr verified/*.stdout $(testbindir)/verified
    3738

  • branches/rel4/psLib/test/fileUtils/tst_psLookupTable_01.c

    r2808 r3059  
    1212*  @author  Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    15 *  @date  $Date: 2004-12-23 19:38:38 $
     14*  @version $Revision: 1.5.2.1 $  $Name: not supported by cvs2svn $
     15*  @date  $Date: 2005-01-19 02:17:05 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636    psLookupTable* table1 = NULL;
    3737
    38     table1 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     38    table1 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    3939    table1 = psLookupTableRead(table1);
    4040    out1 = psLookupTableInterpolate(table1, index1, 0, &status1);
    … …  
    5656    psF64 truthData2[] = {31.5, 41317, 0};
    5757
    58     table2 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     58    table2 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    5959    table2 = psLookupTableRead(table2);
    6060    stats2 = psVectorAlloc(table2->numCols, PS_TYPE_U32);
    … …  
    7878    psLookupTable* table3 = NULL;
    7979
    80     table3 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     80    table3 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    8181    table3 = psLookupTableRead(table3);
    8282    out3 = psLookupTableInterpolate(table3, index3, 0, &status3);
    … …  
    9393    psLookupTable* table4 = NULL;
    9494
    95     table4 = psLookupTableAlloc("../../data/tai_utc.dat", 0, 2451179.6);
     95    table4 = psLookupTableAlloc(UTC_DAT_FILE, 0, 2451179.6);
    9696    table4 = psLookupTableRead(table4);
    9797    out4 = psLookupTableInterpolate(table4, index4, 0, &status4);

  • trunk/psLib/test/dataManip

    • Property svn:ignore

      •  

        old new  
        5454tst_psMinimize07
        5555tst_psRandom
         56seed_msglog1.txt
         57seed_msglog2.txt

  • trunk/psLib/test/dataManip/.cvsignore

    r2837 r3059  
    5454tst_psMinimize07
    5555tst_psRandom
     56seed_msglog1.txt
     57seed_msglog2.txt
Note: See TracChangeset for help on using the changeset viewer.