Changeset 852

Timestamp:

02/28/06 10:51:28 (18 years ago)

Author:

mar637

Message:

added member function rownumbers()
reworked subtable handling

Location:

trunk/src

Files:

• Scantable.cpp (modified) (6 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -61 +61 @@
 
 Scantable::Scantable(Table::TableType ttype) :
-  type_(ttype),
-  freqTable_(ttype),
-  focusTable_(ttype),
-  weatherTable_(ttype),
-  tcalTable_(ttype),
-  moleculeTable_(ttype)
+  type_(ttype)
 {
   setupMainTable();
+  freqTable_ = STFrequencies(*this);
   table_.rwKeywordSet().defineTable("FREQUENCIES", freqTable_.table());
+  weatherTable_ = STWeather(*this);
   table_.rwKeywordSet().defineTable("WEATHER", weatherTable_.table());
+  focusTable_ = STFocus(*this);
   table_.rwKeywordSet().defineTable("FOCUS", focusTable_.table());
+  tcalTable_ = STTcal(*this);
   table_.rwKeywordSet().defineTable("TCAL", tcalTable_.table());
+  moleculeTable_ = STMolecules(*this);
   table_.rwKeywordSet().defineTable("MOLECULES", moleculeTable_.table());
   setupHistoryTable();
   setupFitTable();
+  historyTable_ = table_.keywordSet().asTable("HISTORY");
+  fitTable_ = table_.keywordSet().asTable("FITS");
+  cout << "DEBUG" << endl;
 
   originalTable_ = table_;
   attach();
+  cout << "debug" << endl;
 }
 
 Scantable::Scantable(const std::string& name, Table::TableType ttype) :
-  type_(ttype),
-  freqTable_(ttype)
+  type_(ttype)
 {
   Table tab(name);
@@ -92 +95 @@
   }
   if ( type_ == Table::Memory )
-    table_ = tab.copyToMemoryTable("dummy");
+    table_ = tab.copyToMemoryTable(generateName());
   else
     table_ = tab;
-
+  freqTable_ = STFrequencies(table_.keywordSet().asTable("FREQUENCIES"));
+  focusTable_ = STFocus(table_.keywordSet().asTable("FOCUS"));
+  weatherTable_ = STWeather(table_.keywordSet().asTable("WEATHER"));
+  tcalTable_ = STTcal(table_.keywordSet().asTable("TCAL"));
+  moleculeTable_ = STMolecules(table_.keywordSet().asTable("MOLECULES"));
   originalTable_ = table_;
   attach();
@@ -105 +112 @@
   // with or without data
   if (clear) {
-    table_ = TableCopy::makeEmptyMemoryTable(String("dummy"), other.table_,
-                                             True);
-  } else {
-    table_ = other.table_.copyToMemoryTable(String("dummy"));
+    table_ = TableCopy::makeEmptyMemoryTable(String(generateName()),
+                                             other.table_, True);
+  } else {
+    table_ = other.table_.copyToMemoryTable(String(generateName()));
   }
 
@@ -181 +188 @@
 
   // Now create Table SetUp from the description.
-  SetupNewTable aNewTab("dummy", td, Table::New);
-  table_ = Table(aNewTab, Table::Memory, 0);
-
+  SetupNewTable aNewTab(generateName(), td, Table::New);
+  table_ = Table(aNewTab, type_, 0);
   originalTable_ = table_;
 
@@ -213 +219 @@
 void Scantable::attach()
 {
-  historyTable_ = table_.keywordSet().asTable("HISTORY");
-  fitTable_ = table_.keywordSet().asTable("FITS");
-
   timeCol_.attach(table_, "TIME");
   srcnCol_.attach(table_, "SRCNAME");
@@ -785 +788 @@
 }
 
+std::vector< unsigned int > asap::Scantable::rownumbers( ) const
+{
+  std::vector<unsigned int> stlout;
+  Vector<uInt> vec = table_.rowNumbers();
+  vec.tovector(stlout);
+  return stlout;
+}
+
 }//namespace asap

trunk/src/Scantable.h

@@ -175 +175 @@
   void flag();
 
+  /**
+   * Return a list of row numbers with respect to the original table.
+   * @return a lsi of rownumbers with respect to the original table
+   */
+  std::vector<unsigned int> rownumbers() const;
+
 
   /**