Changeset 1534

Timestamp:

03/24/09 12:33:56 (16 years ago)

Author:

Malte Marquarding

Message:

Fix for Ticket #90; treating integer as double columns now

Location:

trunk

Files:

• python/linecatalog.py (modified) (2 diffs)
• src/LineCatalog.cpp (modified) (3 diffs)
• src/LineCatalog.h (modified) (1 diff)

trunk/python/linecatalog.py

@@ -1 +1 @@
 """
-A representation of a spectra line catalog.
+A representation of a spectral line catalog.
 
 Author: Malte Marquarding
@@ -34 +34 @@
             else:
                 raise IOError(msg)
+
+    def __repr__(self):
+        return lcbase.summary(self, -1)
 
     def summary(self):

trunk/src/LineCatalog.cpp

@@ -62 +62 @@
 void LineCatalog::setPattern(const std::string& name, const std::string& stype)
 {
-  //std::string mode = stype+"('"+name+"')";
-  std::string taql = "SELECT FROM $1 WHERE Column1 == pattern('"+name+"')";
-  cerr << taql << endl;
+  std::string mode = stype+"('"+name+"')";
+  std::string taql = "SELECT FROM $1 WHERE Column1 == " + mode;
   Table tmp = tableCommand(taql, table_);
   if (tmp.nrow() > 0) table_ = tmp.sort("Column2");
@@ -110 +109 @@
       }
   }
-  /// @todo implement me
   return String(oss);
 }
 
-/*!
-    \fn asap::LineCatalog::getName(int row)
- */
+
 std::string LineCatalog::getName(uint row) const
 {
@@ -123 +119 @@
 }
 
-double asap::LineCatalog::getFrequency(uint row) const
+double LineCatalog::getFrequency(uint row) const
 {
-  ROScalarColumn<Double> col(table_, "Column2");
-  return col(row);
+  return getDouble("Column2", row);
 }
 
-double asap::LineCatalog::getStrength(uint row) const
+double LineCatalog::getStrength(uint row) const
 {
-  ROScalarColumn<Double> col(table_, "Column3");
-  return col(row);
+  return getDouble("Column4", row);
 }
 
+double LineCatalog::getDouble(const std::string& colname, uint row) const {
+  DataType dtype = table_.tableDesc().columnDesc(colname).dataType();
+  if (dtype == TpDouble) {
+    ROScalarColumn<Double> col(table_, colname);
+    return col(row);
+  } else if (dtype == TpInt) {
+    ROScalarColumn<Int> col(table_, colname);
+    return Double(col(row));
+  } else {
+    throw AipsError("Column " + colname + "doesn't contain numerical values." );
+  }
+}
 
 } // namespace

trunk/src/LineCatalog.h

@@ -111 +111 @@
   casa::Table setLimits(double lmin, double lmax, const std::string& colname);
 
+  double getDouble(const std::string& colname, uint row) const;
+
   // the table with seelection
   casa::Table table_;