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

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.cpp (modified) (11 diffs)

branches/alma/src/STFocus.cpp

@@ -34 +34 @@
 }
 
-asap::STFocus::STFocus( casa::Table tab ) : STSubTable(tab, name_)
+STFocus::STFocus( casa::Table tab ) : 
+  STSubTable(tab, name_)
 {
+  parangleCol_.attach(table_,"PARANGLE");
   rotationCol_.attach(table_,"ROTATION");
   axisCol_.attach(table_,"AXIS");
@@ -50 +52 @@
 }
 
-STFocus& asap::STFocus::operator =( const STFocus & other )
+STFocus& STFocus::operator =( const STFocus & other )
 {
   if (this != &other) {
     static_cast<STSubTable&>(*this) = other;
+    parangleCol_.attach(table_,"PARANGLE");
     rotationCol_.attach(table_,"ROTATION");
     axisCol_.attach(table_,"AXIS");
@@ -65 +68 @@
   return *this;
 }
-void asap::STFocus::setup( )
+void STFocus::setup( )
 {
   // add to base class table
+  table_.addColumn(ScalarColumnDesc<Float>("PARANGLE"));
   table_.addColumn(ScalarColumnDesc<Float>("ROTATION"));
   table_.addColumn(ScalarColumnDesc<Float>("AXIS"));
@@ -76 +80 @@
   table_.addColumn(ScalarColumnDesc<Float>("XYPHASE"));
   table_.addColumn(ScalarColumnDesc<Float>("XYPHASEOFFSET"));
+  table_.rwKeywordSet().define("PARALLACTIFY", False);
 
   // new cached columns
+  parangleCol_.attach(table_,"PARANGLE");
   rotationCol_.attach(table_,"ROTATION");
   axisCol_.attach(table_,"AXIS");
@@ -88 +94 @@
 }
 
-uInt STFocus::addEntry( Float fax, Float ftan, Float frot, Float hand,
-                        Float user, Float mount,
-                        Float xyphase, Float xyphaseoffset)
+  uInt STFocus::addEntry( Float pa, Float fax, Float ftan, Float frot, Float hand,
+                          Float user, Float mount,
+                          Float xyphase, Float xyphaseoffset)
 {
-  Table result = table_( near(table_.col("ROTATION"), frot)
-                    && near(table_.col("AXIS"), fax)
-                    && near(table_.col("TAN"), ftan)
-                    && near(table_.col("HAND"), hand)
-                    && near(table_.col("USERPHASE"), user)
-                    && near(table_.col("MOUNT"), mount)
-                    && near(table_.col("XYPHASE"), xyphase)
-                    && near(table_.col("XYPHASEOFFSET"), xyphaseoffset)
-                    );
+  Table result = table_(  near(table_.col("PARANGLE"), pa)
+                          && near(table_.col("ROTATION"), frot)
+                          && near(table_.col("AXIS"), fax)
+                          && near(table_.col("TAN"), ftan)
+                          && near(table_.col("HAND"), hand)
+                          && near(table_.col("USERPHASE"), user)
+                          && near(table_.col("MOUNT"), mount)
+                          && near(table_.col("XYPHASE"), xyphase)
+                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset)
+                          );
   uInt resultid = 0;
   if ( result.nrow() > 0) {
@@ -113 +120 @@
       resultid++;
     }
+    parangleCol_.put(rno, pa);
     rotationCol_.put(rno, frot);
     axisCol_.put(rno, fax);
@@ -126 +134 @@
 }
 
-void asap::STFocus::getEntry( Float& rotation, Float& angle, Float& ftan,
-                              Float& hand, Float& user, Float& mount,
-                              Float& xyphase, Float& xyphaseoffset,
-                              uInt id) const
+  void STFocus::getEntry( Float& pa, Float& rotation, Float& angle, Float& ftan,
+                                Float& hand, Float& user, Float& mount,
+                                Float& xyphase, Float& xyphaseoffset,
+                                uInt id) const
 {
   Table t = table_(table_.col("ID") == Int(id) );
@@ -138 +146 @@
   // get first row - there should only be one matching id
   const TableRecord& rec = row.get(0);
+  pa = rec.asFloat("PARANGLE");
   rotation = rec.asFloat("ROTATION");
   angle = rec.asFloat("AXIS");
@@ -149 +158 @@
 
 
-casa::Float asap::STFocus::getTotalFeedAngle( casa::uInt id ) const
+casa::Float STFocus::getTotalAngle( casa::uInt id ) const
 {
   Float total = 0.0f;
   Table t = table_(table_.col("ID") == Int(id) );
   if (t.nrow() == 0 ) {
-    throw(AipsError("STFocus::getEntry - id out of range"));
+    throw(AipsError("STFocus::getTotalAngle - id out of range"));
+  }
+  if (table_.keywordSet().asBool("PARALLACTIFY")) {
+    return 0.0f;
   }
   ROTableRow row(t);
   // get first row - there should only be one matching id
   const TableRecord& rec = row.get(0);
+  total += rec.asFloat("PARANGLE");  
   total += rec.asFloat("ROTATION");
   total += rec.asFloat("USERPHASE");
@@ -164 +177 @@
   return total;
 }
-}
 
-casa::Float asap::STFocus::getFeedHand( casa::uInt id ) const
+
+casa::Float STFocus::getFeedHand( casa::uInt id ) const
 {
   Table t = table_(table_.col("ID") == Int(id) );
@@ -177 +190 @@
 }
 
+void STFocus::setParallactify(bool istrue) {
+  table_.rwKeywordSet().define("PARALLACTIFY", Bool(istrue));
+}
+
+}