Changeset 1779 for branches/mergetest/src/STMolecules.cpp

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• src/STMolecules.cpp (modified) (7 diffs)

branches/mergetest/src/STMolecules.cpp

@@ -14 +14 @@
 #include <tables/Tables/SetupNewTab.h>
 #include <tables/Tables/ScaColDesc.h>
+#include <tables/Tables/ArrColDesc.h>
 #include <tables/Tables/TableRecord.h>
 #include <tables/Tables/TableParse.h>
 #include <tables/Tables/TableRow.h>
 #include <casa/Containers/RecordField.h>
+
+#include <tables/Tables/TableProxy.h>
 
 #include "STMolecules.h"
@@ -59 +62 @@
 {
   // add to base class table
-  table_.addColumn(ScalarColumnDesc<Double>("RESTFREQUENCY"));
-  table_.addColumn(ScalarColumnDesc<String>("NAME"));
-  table_.addColumn(ScalarColumnDesc<String>("FORMATTEDNAME"));
+  //table_.addColumn(ScalarColumnDesc<Double>("RESTFREQUENCY"));
+  table_.addColumn(ArrayColumnDesc<Double>("RESTFREQUENCY"));
+  //table_.addColumn(ScalarColumnDesc<String>("NAME"));
+  table_.addColumn(ArrayColumnDesc<String>("NAME"));
+  //table_.addColumn(ScalarColumnDesc<String>("FORMATTEDNAME"));
+  table_.addColumn(ArrayColumnDesc<String>("FORMATTEDNAME"));
   table_.rwKeywordSet().define("UNIT", String("Hz"));
   // new cached columns
@@ -69 +75 @@
 }
 
+/***
 uInt STMolecules::addEntry( Double restfreq, const String& name,
                             const String& formattedname )
@@ -94 +101 @@
   return resultid;
 }
-
+***/
+uInt STMolecules::addEntry( Vector<Double> restfreq, const Vector<String>& name,
+                            const Vector<String>& formattedname )
+{
+// How to handle this...?
+  Table result =
+    table_( nelements(table_.col("RESTFREQUENCY")) == uInt (restfreq.size()) && 
+            all(table_.col("RESTFREQUENCY")== restfreq) );
+  uInt resultid = 0;
+  if ( result.nrow() > 0) {
+    ROScalarColumn<uInt> c(result, "ID");
+    c.get(0, resultid);
+  } else {
+    uInt rno = table_.nrow();
+    table_.addRow();
+    // get last assigned _id and increment
+    if ( rno > 0 ) {
+      idCol_.get(rno-1, resultid);
+      resultid++;
+    }
+    restfreqCol_.put(rno, restfreq);
+    nameCol_.put(rno, name);
+    formattednameCol_.put(rno, formattedname);
+    idCol_.put(rno, resultid);
+  }
+  return resultid;
+}
+
+
+
+
+/***
 void STMolecules::getEntry( Double& restfreq, String& name,
                             String& formattedname, uInt id ) const
@@ -104 +142 @@
   ROTableRow row(t);
   // get first row - there should only be one matching id
+
   const TableRecord& rec = row.get(0);
   restfreq = rec.asDouble("RESTFREQUENCY");
@@ -109 +148 @@
   formattedname = rec.asString("FORMATTEDNAME");
 }
+***/
+void STMolecules::getEntry( Vector<Double>& restfreq, Vector<String>& name,
+                            Vector<String>& formattedname, uInt id ) const
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STMolecules::getEntry - id out of range"));
+  }
+  ROTableRow row(t);
+  // get first row - there should only be one matching id
+
+  const TableRecord& rec = row.get(0);
+  //restfreq = rec.asDouble("RESTFREQUENCY");
+  restfreq = rec.asArrayDouble("RESTFREQUENCY");
+  //name = rec.asString("NAME");
+  name = rec.asArrayString("NAME");
+  //formattedname = rec.asString("FORMATTEDNAME");
+  formattedname = rec.asArrayString("FORMATTEDNAME");
+}
 
 std::vector< double > asap::STMolecules::getRestFrequencies( ) const
 {
   std::vector<double> out;
+  //TableProxy itsTable(table_);
+  //Record rec;
   Vector<Double> rfs = restfreqCol_.getColumn();
   rfs.tovector(out);
+  //rec = itsTable.getVarColumn("RESTFREQUENCY", 0, 1, 1);
   return out;
 }
 
-double asap::STMolecules::getRestFrequency( uInt id ) const
-{
+std::vector< double > asap::STMolecules::getRestFrequency( uInt id ) const
+{
+  std::vector<double> out;
   Table t = table_(table_.col("ID") == Int(id) );
   if (t.nrow() == 0 ) {
@@ -126 +188 @@
   ROTableRow row(t);
   const TableRecord& rec = row.get(0);
-  return double(rec.asDouble("RESTFREQUENCY"));
-}
-
+  //return double(rec.asDouble("RESTFREQUENCY"));
+  Vector<Double> rfs = rec.asArrayDouble("RESTFREQUENCY");
+  rfs.tovector(out);
+  return out;
+}
+
+int asap::STMolecules::nrow() const
+{
+  return int(table_.nrow());
+}
 
 }//namespace