Changeset 22 for trunk

Timestamp:

07/06/04 11:12:48 (20 years ago)

Author:

mmarquar

Message:

Removed irrelevantr member function "name". Added function to return number of rows in table.

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (4 diffs)
• SDMemTable.h (modified) (3 diffs)

trunk/src/SDMemTable.cc

@@ -65 +65 @@
   beamSel_(0),
   polSel_(0) {
-  name_ = String(name);
-  Table tab(name_);
-  table_ = tab.copyToMemoryTable(name_);
+  Table tab("dummy");
+  table_ = tab.copyToMemoryTable("dummy");
 }
 
@@ -75 +74 @@
   this->polSel_= other.polSel_;
   this->chanMask_ = other.chanMask_;
-  this->name_ = String("dummy");
   this->table_ = other.table_.copyToMemoryTable(String("dummy"));
   // clear all rows()
@@ -91 +89 @@
   beamSel_(0),
   polSel_(0) {
-  name_ = String("SDMemTable");
   String exprs = String("select * from $1 where SCANID == ")
     +String::toString(scanID);
   cerr << exprs << endl;
   Table t = tableCommand(exprs,tab);
-  table_ = t.copyToMemoryTable(name_);
+  table_ = t.copyToMemoryTable("dummy");
 }
 
@@ -119 +116 @@
   // Now create a new table from the description.
 
-  SetupNewTable aNewTab(name_, td, Table::New);
+  SetupNewTable aNewTab("dummy", td, Table::New);
   table_ = Table(aNewTab, Table::Memory, 0);  
-}
-
-std::string SDMemTable::name() const {
-  return name_;
 }
 

trunk/src/SDMemTable.h

@@ -103 +103 @@
   virtual void summary() const;
   
-  // the (irrelevant) name 
-  std::string name() const;
-
   // write to disk as aips++ table
   void makePersistent(const std::string& filename);
@@ -122 +119 @@
   Int nChan() const;
 
+  // return the number of rows (integrations) in the table
+  Int nRows() const { return table_.nrow(); }
+
   // return a row as a Masked array, internally converting uChar flags
   // to bool mask
@@ -128 +128 @@
 
 private:
-  // set up tabel structure
+  // set up table structure
   void setup();
   // the current cursor into the array