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

branches/parallel/src/STMolecules.cpp

@@ -108 +108 @@
   Table result =
     table_( nelements(table_.col("RESTFREQUENCY")) == uInt (restfreq.size()) && 
-            all(table_.col("RESTFREQUENCY")== restfreq) );
+            all(table_.col("RESTFREQUENCY")== restfreq), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {
@@ -152 +152 @@
                             Vector<String>& formattedname, 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("STMolecules::getEntry - id out of range"));
@@ -182 +182 @@
 {
   std::vector<double> out;
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STMolecules::getRestFrequency - id out of range"));