Changeset 3106 for trunk/src/STHeader.h

Timestamp:

10/04/16 18:20:50 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Check-in asap modifications from Jim regarding casacore namespace conversion.

File:

• trunk/src/STHeader.h (modified) (4 diffs)

trunk/src/STHeader.h

@@ -40 +40 @@
 #include <measures/Measures/MDirection.h>
 
-namespace casa {
+namespace casacore {
   template<class T> class Matrix;
 }
@@ -50 +50 @@
 
   bool conformant(const STHeader& other);
-  casa::String diff( const STHeader& other );
+  casacore::String diff( const STHeader& other );
 
 
-  casa::Int nchan;
-  casa::Int npol;
-  casa::Int nif;
-  casa::Int nbeam;
-  casa::String observer;
-  casa::String project;
-  casa::String obstype;
-  casa::String antennaname;
-  casa::Vector<casa::Double> antennaposition;
-  casa::Float equinox;
-  casa::String freqref;
-  casa::Double reffreq;
-  casa::Double bandwidth;
-  casa::Double utc;
-  casa::String fluxunit;
-  casa::String epoch;
-  casa::String poltype;
+  casacore::Int nchan;
+  casacore::Int npol;
+  casacore::Int nif;
+  casacore::Int nbeam;
+  casacore::String observer;
+  casacore::String project;
+  casacore::String obstype;
+  casacore::String antennaname;
+  casacore::Vector<casacore::Double> antennaposition;
+  casacore::Float equinox;
+  casacore::String freqref;
+  casacore::Double reffreq;
+  casacore::Double bandwidth;
+  casacore::Double utc;
+  casacore::String fluxunit;
+  casacore::String epoch;
+  casacore::String poltype;
   void print() const ;
 };
@@ -85 +85 @@
   // direction and another integer index which are just stored along
   // with the the primary entries
-  casa::uInt addEntry(const casa::String& source, casa::uInt ID,
-                      const casa::MDirection& secDir, casa::uInt secID);
+  casacore::uInt addEntry(const casacore::String& source, casacore::uInt ID,
+                      const casacore::MDirection& secDir, casacore::uInt secID);
 
   // Number of entries
-  casa::Int length() const { return n_;}
+  casacore::Int length() const { return n_;}
 
   // Get attributes
-  casa::String source(casa::uInt which) const {return source_[which];}
-  casa::uInt ID(casa::uInt which) const {return ID_[which];}
-  casa::uInt secID(casa::uInt which) const {return secID_[which];}
-  casa::MDirection secDir(casa::uInt which) const {return secDir_[which];}
+  casacore::String source(casacore::uInt which) const {return source_[which];}
+  casacore::uInt ID(casacore::uInt which) const {return ID_[which];}
+  casacore::uInt secID(casacore::uInt which) const {return secID_[which];}
+  casacore::MDirection secDir(casacore::uInt which) const {return secDir_[which];}
 
   // Summary
@@ -101 +101 @@
 
 private:
-  casa::uInt n_;
-  casa::Vector<casa::String> source_;
-  casa::Vector<casa::uInt> ID_, secID_;
-  casa::Block<casa::MDirection> secDir_;
+  casacore::uInt n_;
+  casacore::Vector<casacore::String> source_;
+  casacore::Vector<casacore::uInt> ID_, secID_;
+  casacore::Block<casacore::MDirection> secDir_;
 
   SDDataDesc(const SDDataDesc& other);