Changeset 1126 for trunk

Timestamp:

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

Author:

mar637

Message:

added linecatalog to python inteface

Location:

trunk/src

Files:

• LineCatalog.cpp (modified) (3 diffs)
• LineCatalog.h (modified) (5 diffs)
• python_LineCatalog.cpp (added)
• python_asap.cpp (modified) (1 diff)
• python_asap.h (modified) (1 diff)

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

trunk/src/LineCatalog.h

@@ -49 +49 @@
    * @param fmax the upper frequency bound
    */
-  void setFrequencyLimits(float fmin, float fmax);
+  void setFrequencyLimits(double fmin, double fmax);
   /**
     * select a subset of the table by line strength range
@@ -55 +55 @@
     * @param smin the upper strength bound
     */
-  void setStrengthLimits(float smin, float smax);
+  void setStrengthLimits(double smin, double smax);
   /**
     * select a subset of the data by name pattern match (unix-style)
@@ -71 +71 @@
   /**
     * Return a string representation of this table
-    * @param an integer descriing the row number to show
+    * @param row an integer describing the row number to show
     * default -1 is all rows
     * @return std::string
@@ -77 +77 @@
   std::string summary(int row=-1) const;
 
+  /**
+   * Return the rest frequency value for a specific row
+   * @param row the row number
+   * @return a double rest frequency value
+   */
   double getFrequency(uint row) const;
 
+  /**
+   *
+   * @param row
+   * @return
+   */
   std::string getName(uint row) const;
+
+  int nrow() const  { return table_.nrow(); }
+
+  void reset() { table_ = baseTable_; }
 
 private:
   /**
-   * utility function to hadle range limits
+   * utility function to handle range limits
    * @param lmin the lower limit
    * @param lmax the upper limit
@@ -89 +103 @@
    * @return a new casa::Table
    */
-  casa::Table setLimits(float lmin, float lmax, const std::string& colname);
+  casa::Table setLimits(double lmin, double lmax, const std::string& colname);
 
   // the table with seelection

trunk/src/python_asap.cpp

@@ -63 +63 @@
   asap::python::python_STLineFinder();
   asap::python::python_STFitEntry();
-
   asap::python::python_STWriter();
+  asap::python::python_LineCatalog();
 
   asap::python::python_Logger();

trunk/src/python_asap.h

@@ -44 +44 @@
     void python_STLineFinder();
     void python_STFitEntry();
-
     void python_STWriter();
+    void python_LineCatalog();
     void python_Logger();