Changeset 380 for trunk

Timestamp:

02/08/05 12:31:24 (20 years ago)

Author:

mar637

Message:

• enabled getScan for lists of scanno
• auto renumbering of scanids
• added verbose flag to summary
• slight 80 character width cosmetics on summary

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (15 diffs)
• SDMemTable.h (modified) (2 diffs)
• SDMemTableWrapper.h (modified) (3 diffs)

trunk/src/SDMemTable.cc

@@ -111 +111 @@
   polSel_(0)
 {
+  cout << exprs << endl;
   Table t = tableCommand(exprs,tab);
   if (t.nrow() == 0)
@@ -116 +117 @@
   table_ = t.copyToMemoryTable("dummy");
   attach();
+  renumber();
 }
 
@@ -181 +183 @@
 }
 
-void SDMemTable::attach ()
+void SDMemTable::attach()
 {
   timeCol_.attach(table_, "TIME");
@@ -262 +264 @@
 }
 
-void SDMemTable::resetCursor () 
+void SDMemTable::resetCursor() 
 {
    polSel_ = 0;
@@ -639 +641 @@
   dirCol_.get(whichRow,posit);
   Vector<Double> wpos(2);
+  Int rb;
+  rbeamCol_.get(whichRow,rb);
   wpos[0] = posit(IPosition(2,beamSel_,0));
   wpos[1] = posit(IPosition(2,beamSel_,1));
+  if (refBeam && rb > -1) {  // use refBeam instead if it exists
+    wpos[0] = posit(IPosition(2,rb,0));
+    wpos[1] = posit(IPosition(2,rb,1));
+  }
+
   Quantum<Double> lon(wpos[0],Unit(String("rad")));
   Quantum<Double> lat(wpos[1],Unit(String("rad")));
@@ -646 +655 @@
 }
 
-MEpoch SDMemTable::getEpoch (Int whichRow) const
+MEpoch SDMemTable::getEpoch(Int whichRow) const
 {
   MEpoch::Types met = getTimeReference();
@@ -697 +706 @@
 
 
-SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID, uInt whichRow) const
+SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID, 
+                                                     uInt whichRow) const
 {
 // Create basic SC
@@ -1041 +1051 @@
   MVAngle mvLat(t[1]);
   String sLat = mvLat.string(MVAngle::ANGLE+MVAngle::DIG2,prec);
-
-   return sLon + String(" ") + sLat;
+  return sLon + String(" ") + sLat;
 }
 
@@ -1074 +1083 @@
 }
 
-std::string SDMemTable::summary() const  {
+std::string SDMemTable::summary(bool verbose) const  {
 
   ostringstream oss;
   oss << endl;
-  oss << "--------------------------------------------------" << endl;
+  oss << "--------------------------------------------------------------------------------" << endl;
   oss << " Scan Table Summary" << endl;
-  oss << "--------------------------------------------------" << endl;
+  oss << "--------------------------------------------------------------------------------" << endl;
   oss.flags(std::ios_base::left);
   oss << setw(15) << "Beams:" << setw(4) << nBeam() << endl
@@ -1116 +1125 @@
     MDirection::showType(getDirectionReference())+
     ")";
-  oss << setw(6) << "Scan"
+  oss << setw(5) << "Scan"
       << setw(15) << "Source"
-      << setw(26) << dirtype
+      << setw(24) << dirtype
       << setw(10) << "Time"
       << setw(18) << "Integration" 
-      << setw(10) << "FreqIDs" << endl;
-  oss << "----------------------------------------------------------------------------------" << endl;
+      << setw(7) << "FreqIDs" << endl;
+  oss << "--------------------------------------------------------------------------------" << endl;
   
 //
@@ -1147 +1156 @@
       if (i==nRow-1 &&scanID==lastScanID)  nInt++;   
       if (nInt==1 && i>1) {
-         for (uInt j=0; j<freqIDs.nelements(); j++) mathutil::addEntry(listFQ, freqIDs(j));
+         for (uInt j=0; j<freqIDs.nelements(); j++) 
+           mathutil::addEntry(listFQ, freqIDs(j));
       }
-//
-      oss << setw(6) << scanNo 
+      oss << setw(3) << std::right << scanNo << std::left << setw(2) << "  "
           << setw(15) << name
-          << setw(26) << posit
+          << setw(24) << posit
           << setw(10) << getTime(firstRow,False)
-          << setw(3) << nInt  << setw(3) << " x " << setw(6) <<  t 
+          << setw(3) << std::right << nInt  << setw(3) << " x " << std::left
+          << setw(6) <<  t 
           << " " << listFQ << endl;
 //
@@ -1169 +1179 @@
 
 // Frequency Table
-
-  std::vector<string> info = getCoordInfo();
-  SDFrequencyTable sdft = getSDFreqTable();
-  oss << endl << endl;
-  oss << "FreqID  Frame   RefFreq(Hz)     RefPix   Increment(Hz)" << endl;
-  oss << "----------------------------------------------------------------------------------" << endl;
-  for (uInt i=0; i<sdft.length(); i++) {
-     oss << setw(8) << i << setw(8)
-                    << info[3] << setw(16) << setprecision (8)
-                    << sdft.referenceValue(i) << setw(10)
-                    << sdft.referencePixel(i) << setw(12)
-                    << sdft.increment(i) << endl;
-  }
-  oss << "----------------------------------------------------------------------------------" << endl;
+  if (verbose) {
+    std::vector<string> info = getCoordInfo();
+    SDFrequencyTable sdft = getSDFreqTable();
+    oss << endl << endl;
+    oss << "FreqID  Frame   RefFreq(Hz)     RefPix   Increment(Hz)" << endl;
+    oss << "--------------------------------------------------------------------------------" << endl;
+    for (uInt i=0; i<sdft.length(); i++) {
+      oss << setw(8) << i << setw(8)
+          << info[3] << setw(16) << setprecision(8)
+          << sdft.referenceValue(i) << setw(10)
+          << sdft.referencePixel(i) << setw(12)
+          << sdft.increment(i) << endl;
+    }
+    oss << "--------------------------------------------------------------------------------" << endl;
+  }
   return String(oss);
 }
@@ -1282 +1293 @@
 }
 
-MEpoch::Types SDMemTable::getTimeReference () const
+MEpoch::Types SDMemTable::getTimeReference() const
 {
   MEpoch::Types met;
@@ -1296 +1307 @@
 
 
-Instrument SDMemTable::convertInstrument (const String& instrument,
-                                          Bool throwIt)
+Instrument SDMemTable::convertInstrument(const String& instrument,
+                                         Bool throwIt)
 {
    String t(instrument);
@@ -1319 +1330 @@
       inst = HOBART;
    } else {
-      if (throwIt) {
-         throw AipsError("Unrecognized instrument - use function scan.set_instrument to set");
-      }
+     if (throwIt) {
+       throw AipsError("Unrecognized instrument - use function scan.set_instrument to set");
+     }
    }
    return inst;
 }
 
+void SDMemTable::renumber()
+{
+  uInt nRow = scanCol_.nrow();
+  Int newscanid = 0;
+  Int cIdx;// the current scanid
+  // get the first scanid
+  scanCol_.getScalar(0,cIdx);
+  Int pIdx = cIdx;// the scanid of the previous row
+  for (uInt i=0; i<nRow;++i) {
+    scanCol_.getScalar(i,cIdx);
+    if (pIdx == cIdx) {
+      // renumber
+      scanCol_.put(i,newscanid);
+    } else { 
+      ++newscanid;
+      pIdx = cIdx;   // store scanid
+      --i;           // don't increment next loop
+    }
+  }
+}

trunk/src/SDMemTable.h

@@ -150 +150 @@
 
   // get a summary of the table
-  virtual std::string summary() const;
+  virtual std::string summary(bool verbose=false) const;
 
   std::vector<std::string> history(int whichRow=0) const;
@@ -217 +217 @@
   void setup();
   void attach();
+  void renumber();
   // the current cursor into the array
   casa::Int IFSel_,beamSel_,polSel_;

trunk/src/SDMemTableWrapper.h

@@ -34 +34 @@
 #include <vector>
 #include <string>
+#include <casa/Arrays/Vector.h>
 
 #include "SDMemTable.h"
@@ -60 +61 @@
   }
 
-  SDMemTableWrapper getScan(int scan) {
-    casa::String cond("SELECT * from $1 WHERE SCANID == ");
-    cond += casa::String::toString(scan);
+  //SDMemTableWrapper getScan(int scan) {
+  SDMemTableWrapper getScan(std::vector<int> scan) {
+    casa::String cond("SELECT FROM $1 WHERE SCANID IN ");
+    casa::Vector<casa::Int> v(scan);
+    casa::ostringstream oss;
+    oss << v;
+    cond += casa::String(oss);
     return SDMemTableWrapper(*this, cond);
   }
@@ -157 +162 @@
   casa::CountedPtr<SDMemTable> getCP() const {return table_;}
   SDMemTable* getPtr() {return &(*table_);}
-  std::string summary() const { return table_->summary(); }
+
+  std::string summary(bool verbose=false) const { 
+    return table_->summary(verbose); 
+  }
   
   std::vector<std::string> history(int whichRow=0) {