Changeset 2247 for branches/parallel/src/STFocus.cpp

Timestamp:

07/25/11 14:57:22 (13 years ago)

Author:

Takeshi Nakazato

Message:

merged changes in trunk (r2209,r2202,r2243

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/STFocus.cpp (modified) (4 diffs)

branches/parallel/src/STFocus.cpp

@@ -106 +106 @@
                           && near(table_.col("MOUNT"), mount)
                           && near(table_.col("XYPHASE"), xyphase)
-                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset)
+                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset), 1
                           );
   uInt resultid = 0;
@@ -139 +139 @@
                                 uInt id) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getEntry - id out of range"));
@@ -161 +161 @@
 {
   Float total = 0.0f;
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getTotalAngle - id out of range"));
@@ -181 +181 @@
 casa::Float STFocus::getFeedHand( casa::uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getEntry - id out of range"));