Changeset 1757 for branches/alma/src/STFocus.h

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/STFocus.h (modified) (3 diffs)

branches/alma/src/STFocus.h

@@ -37 +37 @@
   STFocus& operator=(const STFocus& other);
 
-  casa::uInt addEntry( casa::Float faxis, casa::Float ftan,
+  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);
+                       casa::Float xyphase=0.0f, 
+                       casa::Float xyphaseoffset=0.0f);
 
-  void getEntry( casa::Float& fax, casa::Float& ftan,
+  void getEntry( casa::Float& pa, casa::Float& fax, casa::Float& ftan,
                  casa::Float& frot, casa::Float& hand,
                  casa::Float& mount, casa::Float& user,
@@ -48 +49 @@
                  casa::uInt id) const;
 
-  casa::Float getTotalFeedAngle(casa::uInt id) const;
+  casa::Float getTotalAngle(casa::uInt id) const;
+
+  casa::Float getParAngle(casa::uInt id) const {
+    return parangleCol_(id);
+  }
   casa::Float getFeedHand(casa::uInt id) const;
+
+  void setParallactify(bool istrue=false);
 
   const casa::String& name() const { return name_; }
@@ -57 +64 @@
   static const casa::String name_;
   casa::ScalarColumn<casa::Float> rotationCol_, axisCol_,
-                                  tanCol_,handCol_,
-                                  mountCol_,userCol_,
-                                  xyphCol_,xyphoffCol_;
+    tanCol_,handCol_, parangleCol_,
+    mountCol_,userCol_, xyphCol_,xyphoffCol_,;
 };