Changeset 1126 for trunk/src/LineCatalog.cpp

Timestamp:

08/10/06 14:16:19 (18 years ago)

Author:

mar637

Message:

added linecatalog to python inteface

File:

• trunk/src/LineCatalog.cpp (modified) (3 diffs)

trunk/src/LineCatalog.cpp

@@ -38 +38 @@
   std::string inname = path.expandedName();
   File f(inname);
-  if (f.isDirectory()) { //assume its a table
+  if (f.isDirectory()) { //assume it's a table
     table_ = Table(inname);
   } else {
     String formatString;
     // formatSring , TableType, ascii file name, TableDesc name, table name, autoheader
-  table_ = readAsciiTable(formatString, Table::Plain, inname, "", "", True);
+    table_ = readAsciiTable(formatString, Table::Plain, inname, "", "", True);
+    // do not keep aips++ table
+    table_.markForDelete();
   }
   baseTable_ = table_;
 }
 
-void LineCatalog::setStrengthLimits(float smin, float smax)
+void LineCatalog::setStrengthLimits(double smin, double smax)
 {
   table_ = setLimits(smin, smax, "Column4");
 }
 
-void LineCatalog::setFrequencyLimits(float fmin, float fmax)
+void LineCatalog::setFrequencyLimits(double fmin, double fmax)
 {
   table_ = setLimits(fmin, fmax, "Column2");
@@ -60 +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 == "+mode;
+  //std::string mode = stype+"('"+name+"')";
+  std::string taql = "SELECT FROM $1 WHERE Column1 == pattern('"+name+"')";
+  cerr << taql << endl;
   Table tmp = tableCommand(taql, table_);
-  if (tmp.nrow() > 0) table_ = tmp;
+  if (tmp.nrow() > 0) table_ = tmp.sort("Column2");
   else throw(AipsError("No match."));
 }
 
-Table LineCatalog::setLimits(float lmin, float lmax, const std::string& colname)
+Table LineCatalog::setLimits(double lmin, double lmax, const std::string& colname)
 {
-  Table tmp = table_(table_.col(colname) > lmin && table_.col(colname) > lmax);
-  if (tmp.nrow() > 0) return tmp;
+  Table tmp = table_(table_.col(colname) > lmin && table_.col(colname) < lmax);
+  if (tmp.nrow() > 0) return tmp.sort("Column2");
   else throw(AipsError("No match."));
 }
@@ -89 +92 @@
   oss << asap::SEPERATOR << endl << endl;
   if (row == -1) {
-    Vector<uInt> rownrs = table_.rowNumbers(baseTable_);
-    for (uint i=0; i<rownrs.nelements(); ++i) {
-      oss << std::right << setw(7) << rownrs[i];
-      oss << std::left << setw(12) << getName(i);
+    for (uint i=0; i<table_.nrow(); ++i) {
+      oss << std::right << setw(7) << i << setw(2) << "";
+      oss << std::left << setw(20) << getName(i);
       oss << setw(12) << setprecision(8) << std::left << getFrequency(i);
       oss << endl;
     }
   } else {
-    oss << std::right << setw(7) << row;
-    oss << std::left << setw(12) << getName(row);
-    oss << setw(12) << setprecision(8) << std::left << getFrequency(row);
-    oss << endl;
+      if ( row < table_.nrow() ) {
+        oss << std::right << setw(7) << row << setw(2) << "";
+        oss << std::left << setw(20) << getName(row);
+        oss << setw(12) << setprecision(8) << std::left << getFrequency(row);
+        oss << endl;
+      } else {
+        throw(AipsError("Row doesn't exist"));
+      }
   }
   /// @todo implement me