Changeset 2247 for branches/parallel/src/STFrequencies.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/STFrequencies.cpp (modified) (7 diffs)

branches/parallel/src/STFrequencies.cpp

@@ -88 +88 @@
   // test if this already exists
   Table result = table_( near(table_.col("REFVAL"), refval)
-                    && near(table_.col("REFPIX"), refpix)
-                    && near(table_.col("INCREMENT"), inc) );
+                         && near(table_.col("REFPIX"), refpix)
+                         && near(table_.col("INCREMENT"), inc), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {
@@ -116 +116 @@
                               uInt id )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFrequencies::getEntry - freqID out of range"));
@@ -130 +130 @@
 void STFrequencies::setEntry( Double refpix, Double refval, Double inc, uInt id )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFrequencies::getEntry - freqID out of range"));
@@ -147 +147 @@
 SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
 
   if (t.nrow() == 0 ) {
@@ -309 +309 @@
   ostringstream oss;
   if ( id < 0 ) t = table_;
-  else  t = table_(table_.col("ID") == Int(id) );
+  else  t = table_(table_.col("ID") == Int(id), 1 );
   ROTableRow row(t);
   for (uInt i=0; i<t.nrow(); ++i) {
@@ -337 +337 @@
 float STFrequencies::getRefFreq( uInt id, uInt channel )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if ( t.nrow() == 0 ) throw(AipsError("Selected Illegal frequency id"));
   ROTableRow row(t);
@@ -441 +441 @@
 void STFrequencies::shiftRefPix(int npix, uInt id)
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1  );
   if ( t.nrow() == 0 ) throw(AipsError("Selected Illegal frequency id"));
   ScalarColumn<Double> tcol(t, "REFPIX");