Changeset 81


Ignore:
Timestamp:
09/07/04 11:03:26 (20 years ago)
Author:
mar637
Message:

updated to use CASA include paths and .h guards.

Location:
trunk/src
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/MathUtils.cc

    r37 r81  
    3030//#---------------------------------------------------------------------------
    3131
    32 #include <aips/Arrays/Vector.h>
    33 #include <aips/Arrays/VectorSTLIterator.h>
     32#include <casa/Arrays/Vector.h>
     33#include <casa/Arrays/VectorSTLIterator.h>
    3434
    3535template <class T>

  • trunk/src/MathUtils.h

    r37 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _MATHUTILS_H_
    32 #define _MATHUTILS_H_
     31#ifndef _MATHUTILS_H
     32#define _MATHUTILS_H
    3333
    34 #include <aips/aips.h>
    35 #include <aips/Arrays/Vector.h>
     34#include <casa/aips.h>
     35#include <casa/Arrays/Vector.h>
    3636
    3737template <class T>

  • trunk/src/SDContainer.cc

    r79 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #include <aips/Tables/Table.h>
    32 #include <aips/Arrays/IPosition.h>
    33 #include <aips/Arrays/ArrayAccessor.h>
    34 #include <aips/Arrays/Matrix.h>
    35 #include <aips/Quanta/MVTime.h>
     31#include <tables/Tables/Table.h>
     32#include <casa/Arrays/IPosition.h>
     33#include <casa/Arrays/ArrayAccessor.h>
     34#include <casa/Arrays/Matrix.h>
     35#include <casa/Quanta/MVTime.h>
    3636
    3737#include "SDContainer.h"

  • trunk/src/SDContainer.h

    r79 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDCONTAINER_H_
    32 #define _SDCONTAINER_H_
     31#ifndef _SDCONTAINER_H
     32#define _SDCONTAINER_H
    3333
    3434#include <vector>
    3535
    36 #include <aips/aips.h>
    37 #include <aips/Utilities/String.h>
    38 #include <aips/Arrays/Array.h>
    39 #include <aips/Arrays/Vector.h>
     36#include <casa/aips.h>
     37#include <casa/BasicSL/String.h>
     38#include <casa/Arrays/Array.h>
     39#include <casa/Arrays/Vector.h>
    4040
    4141template<class T> class Matrix;
    … …  
    135135  Double timestamp;
    136136  String sourcename;
     137  String fieldname;
    137138  Double interval;
    138139  Int scanid;
     140  String tcaltime;
    139141 
    140142private:

  • trunk/src/SDMath.cc

    r66 r81  
    3131#include <vector>
    3232
    33 #include <aips/aips.h>
    34 #include <aips/Utilities/String.h>
    35 #include <aips/Arrays/IPosition.h>
    36 #include <aips/Arrays/Array.h>
    37 #include <aips/Arrays/ArrayAccessor.h>
    38 #include <aips/Arrays/Slice.h>
    39 #include <aips/Arrays/ArrayMath.h>
    40 #include <aips/Arrays/ArrayLogical.h>
    41 #include <aips/Arrays/MaskedArray.h>
    42 #include <aips/Arrays/MaskArrMath.h>
    43 #include <aips/Arrays/MaskArrLogi.h>
    44 
    45 #include <aips/Tables/Table.h>
    46 #include <aips/Tables/ScalarColumn.h>
    47 #include <aips/Tables/ArrayColumn.h>
    48 
    49 #include <aips/Fitting.h>
    50 #include <trial/Fitting/LinearFit.h>
    51 #include <trial/Functionals/CompiledFunction.h>
    52 #include <trial/Images/ImageUtilities.h>
    53 #include <trial/Coordinates/SpectralCoordinate.h>
    54 #include <aips/Mathematics/AutoDiff.h>
    55 #include <aips/Mathematics/AutoDiffMath.h>
     33#include <casa/aips.h>
     34#include <casa/BasicSL/String.h>
     35#include <casa/Arrays/IPosition.h>
     36#include <casa/Arrays/Array.h>
     37#include <casa/Arrays/ArrayAccessor.h>
     38#include <casa/Arrays/Slice.h>
     39#include <casa/Arrays/ArrayMath.h>
     40#include <casa/Arrays/ArrayLogical.h>
     41#include <casa/Arrays/MaskedArray.h>
     42#include <casa/Arrays/MaskArrMath.h>
     43#include <casa/Arrays/MaskArrLogi.h>
     44
     45#include <tables/Tables/Table.h>
     46#include <tables/Tables/ScalarColumn.h>
     47#include <tables/Tables/ArrayColumn.h>
     48
     49#include <scimath/Fitting.h>
     50#include <scimath/Fitting/LinearFit.h>
     51#include <scimath/Functionals/CompiledFunction.h>
     52#include <images/Images/ImageUtilities.h>
     53#include <coordinates/Coordinates/SpectralCoordinate.h>
     54#include <scimath/Mathematics/AutoDiff.h>
     55#include <scimath/Mathematics/AutoDiffMath.h>
    5656
    5757#include "MathUtils.h"

  • trunk/src/SDMath.h

    r66 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDMATH_H_
    32 #define _SDMATH_H_
     31#ifndef _SDMATH_H
     32#define _SDMATH_H
    3333
    3434#include <string>
    3535#include <vector>
    36 #include <aips/Utilities/CountedPtr.h>
     36#include <casa/Utilities/CountedPtr.h>
    3737
    3838namespace atnf_sd {

  • trunk/src/SDMathWrapper.h

    r69 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDMATHWRAPPER_H_
    32 #define _SDMATHWRAPPER_H_
     31#ifndef _SDMATHWRAPPER_H
     32#define _SDMATHWRAPPER_H
    3333
    3434#include <vector>

  • trunk/src/SDReader.h

    r46 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDREADER_H_
    32 #define _SDREADER_H_
     31#ifndef _SDREADER_H
     32#define _SDREADER_H
    3333
    3434#include <vector>
    3535#include <string>
    3636
    37 #include <aips/aips.h>
    38 #include <aips/iostream.h>
    39 #include <aips/Utilities/CountedPtr.h>
    40 #include <aips/Utilities/String.h>
    41 #include <aips/Arrays/Vector.h>
     37#include <casa/aips.h>
     38#include <casa/iostream.h>
     39#include <casa/Utilities/CountedPtr.h>
     40#include <casa/BasicSL/String.h>
     41#include <casa/Arrays/Vector.h>
    4242
    4343#include "SDMemTable.h"

  • trunk/src/SDReaderWrapper.h

    r52 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDREADERWRAPPER_H_
    32 #define _SDREADERWRAPPER_H_
     31#ifndef _SDREADERWRAPPER_H
     32#define _SDREADERWRAPPER_H
    3333
    3434#include <vector>

  • trunk/src/SDTemplates.cc

    r70 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #include <aips/Containers/Block.h>
    32 #include <aips/Exceptions/Error.cc>
    33 #include <aips/Exceptions/Error2.cc>
    34 #include <aips/Utilities/CountedPtr.cc>
    35 #include <aips/Utilities/CountedPtr2.cc>
    36 #include <aips/Utilities/Copy.cc>
     31#include <casa/Containers/Block.h>
     32#include <casa/Exceptions/Error.cc>
     33#include <casa/Exceptions/Error2.cc>
     34#include <casa/Utilities/CountedPtr.cc>
     35#include <casa/Utilities/CountedPtr2.cc>
     36#include <casa/Utilities/Copy.cc>
    3737#include "SDMemTable.h"
    3838
    … …  
    4949template void objset(CountedPtr<atnf_sd::SDMemTable> *, CountedPtr<atnf_sd::SDMemTable>, uInt);
    5050
    51 #include <aips/Arrays/ArrayLogical.cc>
    52 #include <aips/Arrays/ArrayMath.cc>
    53 #include <aips/Arrays/MaskArrMath.cc>
    54 #include <aips/Arrays/Array.h>
    55 #include <trial/Functionals/CompiledFunction.cc>
    56 #include <trial/Functionals/CompiledParam.cc>
    57 #include <aips/Mathematics/AutoDiff.h>
    58 #include <aips/Mathematics/AutoDiffMath.h>
    59 #include <aips/Arrays/Vector2.cc>
    60 #include <trial/Images/ImageUtilities2.cc>
    61 #include <aips/Utilities/PtrHolder.cc>
    62 #include <aips/Lattices/Lattice.h>
     51#include <casa/Arrays/ArrayLogical.cc>
     52#include <casa/Arrays/ArrayMath.cc>
     53#include <casa/Arrays/MaskArrMath.cc>
     54#include <casa/Arrays/Array.h>
     55#include <scimath/Functionals/CompiledFunction.cc>
     56#include <scimath/Functionals/CompiledParam.cc>
     57#include <scimath/Mathematics/AutoDiff.h>
     58#include <scimath/Mathematics/AutoDiffMath.h>
     59#include <casa/Arrays/Vector2.cc>
     60#include <images/Images/ImageUtilities2.cc>
     61#include <casa/Utilities/PtrHolder.cc>
     62#include <lattices/Lattices/Lattice.h>
    6363#include "MathUtils.cc"
    6464

  • trunk/src/SDWriter.cc

    r79 r81  
    3232#include <string>
    3333
    34 #include <aips/aips.h>
    35 #include <aips/Arrays.h>
    36 #include <aips/Mathematics/Complex.h>
    37 #include <aips/Utilities/CountedPtr.h>
     34#include <casa/aips.h>
     35#include <casa/Arrays.h>
     36#include <casa/BasicSL/Complex.h>
     37#include <casa/Utilities/CountedPtr.h>
    3838
    3939#include <atnf/PKSIO/PKSMS2writer.h>

  • trunk/src/SDWriter.h

    r53 r81  
    2929//# $Id$
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDWRITER_H_
    32 #define _SDWRITER_H_
     31#ifndef _SDWRITER_H
     32#define _SDWRITER_H
    3333
    3434#include <string>
    3535
    36 #include <aips/aips.h>
    37 #include <aips/Utilities/CountedPtr.h>
     36#include <casa/aips.h>
     37#include <casa/Utilities/CountedPtr.h>
    3838
    3939#include <SDMemTable.h>

  • trunk/src/SDWriterWrapper.h

    r54 r81  
    2929//# $Id:
    3030//#---------------------------------------------------------------------------
    31 #ifndef _SDWRITERWRAPPER_H_
    32 #define _SDWRITERWRAPPER_H_
     31#ifndef _SDWRITERWRAPPER_H
     32#define _SDWRITERWRAPPER_H
    3333
    3434#include <vector>

  • trunk/src/python_SD.h

    r30 r81  
    2929//# $Id$
    3030//#---------------------------------------------------------------------------
    31 #ifndef _PYTHON_SD_H_
    32 #define _PYTHON_SD_H_
     31#ifndef _PYTHON_SD_H
     32#define _PYTHON_SD_H
    3333
    3434namespace atnf_sd {
    3535  namespace python {
    3636
    37 void python_SDMemTable();
    38 void python_SDReader();
    39 void python_SDWriter();
    40 void python_SDMath();
    41 
     37    void python_SDMemTable();
     38    void python_SDReader();
     39    void python_SDWriter();
     40    void python_SDMath();
     41   
    4242  } // python
    4343} //atnf_sd
Note: See TracChangeset for help on using the changeset viewer.