Changeset 50 for trunk/src

Timestamp:

07/15/04 15:58:02 (20 years ago)

Author:

mmarquar

Message:

Removed name_ related fields and functions.
Changed getTime to sprint out string of MVTime.
Added range checks for setIF/Pol/Beam functions.
Added const to get type functions, where it was missing.
Removed debugging cerr from getAbscissa
Added setCoordinate to set the Frequency Table from SpectralCoordinate.
Added nScans()
Added more info printing to summary

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (15 diffs)
• SDMemTable.h (modified) (6 diffs)

trunk/src/SDMemTable.cc

@@ -32 +32 @@
 
 #include <aips/iostream.h>
+#include <aips/iomanip.h>
 #include <aips/Arrays/Array.h>
 #include <aips/Arrays/ArrayMath.h>
@@ -49 +50 @@
 #include <aips/Tables/TableRecord.h>
 #include <aips/Measures/MFrequency.h>
+#include <aips/Quanta/MVTime.h>
 
 #include "SDMemTable.h"
@@ -65 +67 @@
   beamSel_(0),
   polSel_(0) {
-  Table tab("dummy");
+  Table tab(name);
   table_ = tab.copyToMemoryTable("dummy");
 }
@@ -91 +93 @@
   String exprs = String("select * from $1 where SCANID == ")
     +String::toString(scanID);
-  cerr << exprs << endl;
+  //cerr << exprs << endl;
   Table t = tableCommand(exprs,tab);
   table_ = t.copyToMemoryTable("dummy");
@@ -97 +99 @@
 
 SDMemTable::~SDMemTable(){
-  cerr << "goodbye from SDMemTable @ " << this << endl;
+  //cerr << "goodbye from SDMemTable @ " << this << endl;
 }
 
@@ -128 +130 @@
 }
 
-Double SDMemTable::getTime(Int whichRow) const {
+std::string SDMemTable::getTime(Int whichRow) const {
   ROScalarColumn<Double> src(table_, "TIME");
   Double tm;
   src.get(whichRow, tm);
-  return tm;
+  MVTime mvt(tm);
+  mvt.setFormat(MVTime::YMD);
+  ostringstream oss;
+  oss << mvt;
+  String str(oss);
+  return str;
+}
+double SDMemTable::getInterval(Int whichRow) const {
+  ROScalarColumn<Double> src(table_, "INTERVAL");
+  Double intval;
+  src.get(whichRow, intval);
+  return intval;
 }
 
 bool SDMemTable::setIF(Int whichIF) {
-  //if ( whichIF >= 0 && whichIF < nIF_) {
+  if ( whichIF >= 0 && whichIF < nIF()) {
     IFSel_ = whichIF;
     return true;
-    //}
-    //return false;
-}
+  }
+  return false;
+}
+
 bool SDMemTable::setBeam(Int whichBeam) {
-  //if ( whichBeam >= 0 && whichBeam < nBeam_) {
+  if ( whichBeam >= 0 && whichBeam < nBeam()) {
     beamSel_ = whichBeam;
     return true;
-    //}
-    //return false;
-
-}
+  }
+  return false;
+}
+
 bool SDMemTable::setPol(Int whichPol) {
-  //if ( whichPol >= 0 && whichPol < nPol_) {
+  if ( whichPol >= 0 && whichPol < nPol()) {
     polSel_ = whichPol;
     return true;
-    //}
-    //return false;
+  }
+  return false;
 }
 
@@ -200 +214 @@
   return mask;
 }
-std::vector<float> SDMemTable::getSpectrum(Int whichRow) {
+std::vector<float> SDMemTable::getSpectrum(Int whichRow) const {
 
   std::vector<float> spectrum;
@@ -228 +242 @@
   fid.get(whichRow, v);
   uInt specidx = v(IFSel_);
-  cerr << "specidx = " << specidx << endl;
   Unit u;
   if (whichUnit == "") {
@@ -236 +249 @@
   }
   SpectralCoordinate spc = getCoordinate(specidx);
-  cerr << "debug"  << endl;
   if ( u == Unit("km/s") ) {
-    cerr << "vel ??? " << restfreq << endl;
     if (Double(restfreq) >  Double(0.000001)) {
       cerr << "converting to velocities"<< endl;
@@ -259 +270 @@
     Double tmp;
     uInt i = 0;
-    for (it = absc.begin(); it != absc.end(); ++it) {
-      
+    for (it = absc.begin(); it != absc.end(); ++it) {      
       spc.toWorld(tmp,absc1[i]);
       (*it) = tmp;
       i++;
     }
-    cerr << "converted all pic to world" << endl;
-  }
-  cerr << "exiting getAbscissa" << endl;
+  }
   return absc;
 }
@@ -401 +409 @@
   rvc.get(whichIdx, rv);
   incc.get(whichIdx, inc);
-  cerr << "creating speccord from " << whichIdx << ": "
-       << rp <<", " << rv << ", " << inc << ", " << mft <<endl;
+  //cerr << "creating speccord from " << whichIdx << ": "
+  //     << rp <<", " << rv << ", " << inc << ", " << mft <<endl;
   SpectralCoordinate spec(mft,rv,inc,rp);
-  cerr << "debugit" << endl;
   return spec;
 }
+
+Bool SDMemTable::setCoordinate(const SpectralCoordinate& speccord, 
+                               uInt whichIdx) {
+  Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
+  if (whichIdx > t.nrow() ) {
+    cerr << "SDMemTable::setCoordinate - whichIdx out of range" << endl;
+    return;
+  }
+  ScalarColumn<Double> rpc(t, "REFPIX");
+  ScalarColumn<Double> rvc(t, "REFVAL");
+  ScalarColumn<Double> incc(t, "INCREMENT");
+  
+  rpc.put(whichIdx, speccord.referencePixel()[0]);
+  rvc.put(whichIdx, speccord.referenceValue()[0]);
+  incc.put(whichIdx, speccord.increment()[0]);
+
+  return True;
+}
+
 
 bool SDMemTable::putSDFreqTable(const SDFrequencyTable& sdft) {
@@ -427 +453 @@
   aTable.rwKeywordSet().define("Unit", String("kms-1"));
   table_.rwKeywordSet().defineTable ("FREQUENCIES", aTable);
-  cerr << "debug - putSDFreqTable" << endl;
   return True;
 }
@@ -508 +533 @@
   table_.rwKeywordSet().define("UTC", sdh.utc);
   table_.unlock();
-  cerr << "Table Header set" << endl;
   return true;
-}\
+}
 
 SDHeader SDMemTable::getSDHeader() const {
@@ -534 +558 @@
 }
 
+Int SDMemTable::nScans() const {
+  Int n = 0;
+  ROScalarColumn<Int> scans(table_, "SCANID");
+  Int previous = -1;Int current=0;
+  for (uInt i=0; i< scans.nrow();i++) {
+    scans.getScalar(i,current);
+    if (previous != current) {
+      previous = current;     
+      n++;
+    }
+  }
+  return n;
+}
+
 void SDMemTable::summary() const {
   ROScalarColumn<Int> scans(table_, "SCANID");
@@ -546 +584 @@
   String name;
   Int previous = -1;Int current=0;
-  cout << "Scan\tSource" << endl;
+  cout << "Scan\tSource\t\tTime\t\tIntegration" << endl;
   for (uInt i=0; i< scans.nrow();i++) {
     scans.getScalar(i,current);
     if (previous != current) {
       srcs.getScalar(i,name);
-      previous = current;     
+      previous = current;
+      Double t = getInterval();
+      String unit("sec");
+      if (t/60.0 > 1.0) {
+        t/=60.0;unit = "min";
+      }
+      cout << count << "\t" 
+           << name << "\t"
+           << getTime() << "\t"
+           << setprecision(2) <<  setiosflags(std::ios_base::fixed)
+           << t << " " << unit << endl
+           << endl;
       count++;
-      cout << count << "\t" 
-           << name 
-           << endl;
     }
   }

trunk/src/SDMemTable.h

@@ -54 +54 @@
   // create a new (empty) SDMemTable
   SDMemTable();
-  // create a SDMemTable from a )aips++) table on disk
+  // create a SDMemTable from an (aips++) table on disk
   SDMemTable(const std::string& name);
 
@@ -78 +78 @@
   // get spectrum,mask and tsys for the given row, at the selected
   // cursor - all as stl vectors
-  virtual std::vector<float> getSpectrum(Int whichRow);
-  virtual std::vector<bool> getMask(Int whichRow) const;
+  virtual std::vector<float> getSpectrum(Int whichRow=0) const;
+  virtual std::vector<bool> getMask(Int whichRow=0) const;
 
-  virtual Float getTsys(Int whichRow) const;
+  virtual Float getTsys(Int whichRow=0) const;
   // get all as aips++ Vectors
   virtual void getSpectrum(Vector<Float>& spectrum, Int whichRow=0);
@@ -87 +87 @@
 
   // get info for current row
-  virtual Double getTime(Int whichRow) const ;
-  virtual std::string getSourceName(Int whichRow) const;
-  
+  std::string getTime(Int whichRow=0) const ;
+  std::string getSourceName(Int whichRow=0) const;
+  double getInterval(Int whichRow=0) const;
+
   // set the current value
   virtual bool setIF(Int whichIF=0);
@@ -102 +103 @@
   virtual Int getPol() { return polSel_; }   
  
+  // number of scans in table
+  virtual Int nScans() const;
+
   // print a summary to stdout
   virtual void summary() const;
@@ -130 +134 @@
 
   SpectralCoordinate getCoordinate(uInt whichIdx) const;
+  Bool setCoordinate(const SpectralCoordinate& speccord, uInt whichIdx);
+
   std::vector<double> getAbscissa(int whichRow, 
                                   const std::string& whichUnit="GHz",
@@ -139 +145 @@
   Int IFSel_,beamSel_,polSel_;
   std::vector<bool> chanMask_;  
-  String name_;
-  // the unerlying memory table
+  // the underlying memory table
   Table table_;
 };