Changeset 3106 for trunk/src/STFocus.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/STFocus.h (modified) (2 diffs)

trunk/src/STFocus.h

@@ -30 +30 @@
 public:
   STFocus() {;}
-  explicit STFocus(casa::Table tab);
+  explicit STFocus(casacore::Table tab);
   explicit STFocus( const Scantable& parent );
 
@@ -37 +37 @@
   STFocus& operator=(const STFocus& other);
 
-  casa::uInt addEntry( casa::Float pa, casa::Float faxis, casa::Float ftan,
-                       casa::Float frot, casa::Float hand=1.0f,
-                       casa::Float mount=0.0f, casa::Float user=0.0f,
-                       casa::Float xyphase=0.0f, 
-                       casa::Float xyphaseoffset=0.0f);
+  casacore::uInt addEntry( casacore::Float pa, casacore::Float faxis, casacore::Float ftan,
+                       casacore::Float frot, casacore::Float hand=1.0f,
+                       casacore::Float mount=0.0f, casacore::Float user=0.0f,
+                       casacore::Float xyphase=0.0f,
+                       casacore::Float xyphaseoffset=0.0f);
 
-  void getEntry( casa::Float& pa, casa::Float& fax, casa::Float& ftan,
-                 casa::Float& frot, casa::Float& hand,
-                 casa::Float& mount, casa::Float& user,
-                 casa::Float& xyphase, casa::Float& xyphaseoffset,
-                 casa::uInt id) const;
+  void getEntry( casacore::Float& pa, casacore::Float& fax, casacore::Float& ftan,
+                 casacore::Float& frot, casacore::Float& hand,
+                 casacore::Float& mount, casacore::Float& user,
+                 casacore::Float& xyphase, casacore::Float& xyphaseoffset,
+                 casacore::uInt id) const;
 
-  casa::Float getTotalAngle(casa::uInt id) const;
+  casacore::Float getTotalAngle(casacore::uInt id) const;
 
-  casa::Float getParAngle(casa::uInt id) const {
+  casacore::Float getParAngle(casacore::uInt id) const {
     return parangleCol_(id);
   }
-  casa::Float getFeedHand(casa::uInt id) const;
+  casacore::Float getFeedHand(casacore::uInt id) const;
 
   void setParallactify(bool istrue=false);
 
-  const casa::String& name() const { return name_; }
+  const casacore::String& name() const { return name_; }
 
 private:
   void setup();
-  static const casa::String name_;
-  casa::ScalarColumn<casa::Float> rotationCol_, axisCol_,
+  static const casacore::String name_;
+  casacore::ScalarColumn<casacore::Float> rotationCol_, axisCol_,
     tanCol_,handCol_, parangleCol_,
     mountCol_,userCol_, xyphCol_,xyphoffCol_;