Changes in trunk/src/SDMemTable.h [19:22]

File:

• trunk/src/SDMemTable.h (modified) (5 diffs)

trunk/src/SDMemTable.h

@@ -69 +69 @@
   virtual bool putSDHeader(const SDHeader& sdh);
   virtual bool putSDFreqTable(const SDFrequencyTable& sdft) {;}
+
+  //get the dat wrapped up in a meta container
+  virtual SDContainer getSDContainer(uInt whichRow=0) const;
+  virtual SDHeader getSDHeader() const;
   
   // get spectrum,mask and tsys for the given row, at the selected
-  // cursor
-  virtual std::vector<float> getSpectrum(Int whichRow) const;
+  // cursor - all as stl vectors
+  virtual std::vector<float> getSpectrum(Int whichRow);
   virtual std::vector<bool> getMask(Int whichRow) const;
+
   virtual Float getTsys(Int whichRow) const;
+  // get all as aips++ Vectors
+  virtual void getSpectrum(Vector<Float>& spectrum, Int whichRow=0);
+  virtual void getMask(Vector<Bool>& mask,Int whichRow=0) const;
 
-  // get info fro current row
+  // get info for current row
   virtual Double getTime(Int whichRow) const ;
   virtual std::string getSourceName(Int whichRow) const;
@@ -95 +103 @@
   virtual void summary() const;
   
-  // the (irrelevant) name 
-  std::string name() const;
-
   // write to disk as aips++ table
   void makePersistent(const std::string& filename);
@@ -104 +109 @@
   SDMemTable getScan(Int scanID);
 
-  const TableRecord& getHeader() const {;}
+  const TableRecord& getHeader() const {return table_.keywordSet();}
   // get a handle to the "raw" aips++ table
   const Table& table() { return table_; }
@@ -114 +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
@@ -120 +128 @@
 
 private:
-  // set up tabel structure
+  // set up table structure
   void setup();
   // the current cursor into the array