Changeset 483

Timestamp:

02/21/05 08:21:00 (20 years ago)

Author:

mar637

Message:

• Added history support.
• Added version keyword to SDMemTable.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (1 diff)
• SDContainer.h (modified) (2 diffs)
• SDFitter.cc (modified) (4 diffs)
• SDMemTable.cc (modified) (19 diffs)
• SDMemTable.h (modified) (3 diffs)
• SDMemTableWrapper.h (modified) (4 diffs)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDContainer.cc

@@ -479 +479 @@
 }
 
-Bool SDContainer::appendHistory(const String& hist)
-{
-  history_.resize(history_.nelements()+1,True);
-  history_[history_.nelements()-1] = hist;
-  return True;
-}
-Bool SDContainer::putHistory(const Vector<String>& hist)
-{
-  history_.resize();
-  history_ = hist;
-  return True;
-}
-
 Bool SDContainer::putFitMap(const Array<Int>& arr) {
   fitIDMap_.resize();

trunk/src/SDContainer.h

@@ -167 +167 @@
   { return restfreqidx_; }
   
-  const casa::Vector<casa::String>& getHistory() const { return history_; }
-  casa::Bool putHistory(const casa::Vector<casa::String>& hist);
-  casa::Bool appendHistory(const casa::String& hist);
-
   casa::Bool putFitMap(const casa::Array<casa::Int>& arr);
 
@@ -210 +206 @@
   //(nBeam,2) maybe use Measures here...
   casa::Array<casa::Double>   direction_;
-  casa::Vector<casa::String> history_;
   casa::Array<casa::Int> fitIDMap_;
 

trunk/src/SDFitter.cc

@@ -60 +60 @@
     for (uInt i=0;i< funcs_.nelements();++i) {
         delete funcs_[i]; funcs_[i] = 0;
-    };
+    }
     funcs_.resize(0, True);
     parameters_.resize();
@@ -146 +146 @@
         funcs_[0] = new Polynomial<Float>(ncomp);
     } else {
-        cerr << " compiled functions not yet implemented" << endl;
+        //cerr << " compiled functions not yet implemented" << endl;
         //funcs_.resize(1);
         //funcs_[0] = new CompiledFunction<Float>();
@@ -285 +285 @@
         //computeEstimates();
         for (uInt i=0; i<funcs_.nelements(); i++) {
-            Gaussian1D<AutoDiff<Float> > gauss;
-            for (uInt j=0; j<funcs_[i]->nparameters(); j++) {
-                gauss[j] = AutoDiff<Float>((*funcs_[i])[j], gauss.nparameters(), j);
-                gauss.mask(j) = funcs_[i]->mask(j);
+            Gaussian1D<AutoDiff<Float> > gauss;//(*funcs_[i]);
+            
+            for (uInt j=0; j<funcs_[i]->nparameters(); j++) {
+                gauss[j] = AutoDiff<Float>((*funcs_[i])[j], 
+                                           gauss.nparameters(), j);
+                gauss.mask(j) = funcs_[i]->mask(j);
             }
+            
             func.addFunction(gauss);
         }
     } else if (dynamic_cast<Polynomial<Float>* >(funcs_[0]) != 0) {
-        Polynomial<AutoDiff<Float> > poly(funcs_[0]->nparameters()-1);
-        for (uInt j=0; j<funcs_[0]->nparameters(); j++) {
-            poly[j] = AutoDiff<Float>(0, poly.nparameters(), j);
-            poly.mask(j) = funcs_[0]->mask(j);
-        }
-        func.addFunction(poly);
+        Polynomial<AutoDiff<Float> > poly(funcs_[0]->nparameters()-1);
+        //Polynomial<AutoDiff<Float> > poly(*funcs_[0]);
+        for (uInt j=0; j<funcs_[0]->nparameters(); j++) {
+            poly[j] = AutoDiff<Float>(0, poly.nparameters(), j);
+            poly.mask(j) = funcs_[0]->mask(j);
+        }
+        func.addFunction(poly);
     } else if (dynamic_cast<CompiledFunction<Float>* >(funcs_[0]) != 0) {
-
-//         CompiledFunction<AutoDiff<Float> > comp;
-//         for (uInt j=0; j<funcs_[0]->nparameters(); j++) {
+        
+        //         CompiledFunction<AutoDiff<Float> > comp;
+        //         for (uInt j=0; j<funcs_[0]->nparameters(); j++) {
 //             comp[j] = AutoDiff<Float>(0, comp.nparameters(), j);
 //             comp.mask(j) = funcs_[0]->mask(j);
 //         }
 //         func.addFunction(comp);
-
+        
         cout << "NYI." << endl;
     } else {
-        throw (AipsError("Fitter not set up correctly."));
+        throw(AipsError("Fitter not set up correctly."));
     }
     fitter.setFunction(func);
@@ -316 +320 @@
     // Convergence criterium
     fitter.setCriteria(0.001);
+
     // Fit
     Vector<Float> sigma(x_.nelements());
     sigma = 1.0;
-    //Vector<Float> sol;
+
     parameters_.resize();
-    //Vector<Float> err;
+    parameters_ = fitter.fit(x_, y_, sigma, &m_);
+
     error_.resize();
-    parameters_ = fitter.fit(x_, y_, sigma, &m_);
-    /*
-    CompoundFunction<Float> f;
-    for (uInt i=0; i<funcs_.nelements(); i++) {
-        f.addFunction(*funcs_[i]);
-    }
-    f.parameters().setParameters(parameters_);
-    */
     error_ = fitter.errors();
+
     chisquared_ = fitter.getChi2();
+
     residual_.resize();
     residual_ =  y_;
     fitter.residual(residual_,x_);
+
     // use fitter.residual(model=True) to get the model
     thefit_.resize(x_.nelements());

trunk/src/SDMemTable.cc

@@ -85 +85 @@
 {
   Table tab(name);
+  uInt version;
+  tab.keywordSet().get("VERSION", version);
+  if (version != version_) {
+    throw(AipsError("Unsupported version of ASAP file."));
+  }
   table_ = tab.copyToMemoryTable("dummy");
   //cerr << "hello from C SDMemTable @ " << this << endl;
@@ -92 +97 @@
 SDMemTable::SDMemTable(const SDMemTable& other, Bool clear)
 {
-  IFSel_= other.IFSel_;
-  beamSel_= other.beamSel_;
-  polSel_= other.polSel_;
-  chanMask_ = other.chanMask_;
   table_ = other.table_.copyToMemoryTable(String("dummy"));
   // clear all rows()
   if (clear) {
     table_.removeRow(this->table_.rowNumbers());
+    IFSel_= 0;
+    beamSel_= 0;
+    polSel_= 0;
+    chanMask_.resize(0);
   } else {
-    IFSel_ = other.IFSel_;
-    beamSel_ = other.beamSel_;
-    polSel_ = other.polSel_;
-  }
-//
+    IFSel_= other.IFSel_;
+    beamSel_= other.beamSel_;
+    polSel_= other.polSel_;
+    chanMask_.resize(0);
+    chanMask_ = other.chanMask_;
+  }
+
   attach();
   //cerr << "hello from CC SDMemTable @ " << this << endl;
@@ -146 +153 @@
      attach();
   }
-  //cerr << "hello from ASS SDMemTable @ " << this << endl;
   return *this;
 }
@@ -161 +167 @@
   TableDesc td("", "1", TableDesc::Scratch);
   td.comment() = "A SDMemTable";
-  
+  td.rwKeywordSet().define("VERSION", Int(version_));
+
   td.addColumn(ScalarColumnDesc<Double>("TIME"));
   td.addColumn(ScalarColumnDesc<String>("SRCNAME"));
@@ -180 +187 @@
   td.addColumn(ScalarColumnDesc<Float>("PARANGLE"));
   td.addColumn(ScalarColumnDesc<Int>("REFBEAM"));
-  td.addColumn(ArrayColumnDesc<String>("HISTORY"));
   td.addColumn(ArrayColumnDesc<Int>("FITID"));
 
-
   // Now create Table SetUp from the description.
-
   SetupNewTable aNewTab("dummy", td, Table::New);
 
@@ -192 +196 @@
   // point, we must bind the Virtual Engine regardless.  The STOKES
   // column won't be accessed if not appropriate (nPol=4)
-
-
-   SDStokesEngine::registerClass();
-   SDStokesEngine stokesEngine(String("STOKES"), String("SPECTRA"));
-   aNewTab.bindColumn ("STOKES", stokesEngine);
-
-   // Create Table
-  table_ = Table(aNewTab, Table::Memory, 0);
+  SDStokesEngine::registerClass();
+  SDStokesEngine stokesEngine(String("STOKES"), String("SPECTRA"));
+  aNewTab.bindColumn("STOKES", stokesEngine);
+  
+  // Create Table
+  table_ = Table(aNewTab, Table::Memory, 0); 
   // add subtable 
   TableDesc tdf("", "1", TableDesc::Scratch);
@@ -211 +213 @@
   table_.rwKeywordSet().defineTable("FITS", fitTable);
 
-
+  TableDesc tdh("", "1", TableDesc::Scratch);
+  tdh.addColumn(ScalarColumnDesc<String>("ITEM"));
+  SetupNewTable histtab("hist", tdh, Table::New);
+  Table histTable(histtab, Table::Memory);
+  table_.rwKeywordSet().defineTable("HISTORY", histTable);
 }
 
@@ -234 +240 @@
   paraCol_.attach(table_, "PARANGLE");
   rbeamCol_.attach(table_, "REFBEAM");
-  histCol_.attach(table_, "HISTORY");
   fitCol_.attach(table_,"FITID");
 }
@@ -359 +364 @@
 std::vector<float> SDMemTable::getSpectrum(Int whichRow) const 
 {
-
   Array<Float> arr;
   specCol_.get(whichRow, arr);
@@ -385 +389 @@
      const IPosition& shape = arr.shape();
      IPosition start, end;
-     setCursorSlice (start, end, shape);
+     getCursorSlice(start, end, shape);
 
      // Get Q and U slices
@@ -433 +437 @@
   const IPosition& shape = arr.shape();
   IPosition start, end;
-  setCursorSlice(start, end, shape);
+  getCursorSlice(start, end, shape);
 
   // Get I and V slices
@@ -1199 +1203 @@
   elCol_.put(rno, sdc.elevation);
   paraCol_.put(rno, sdc.parangle);
-  histCol_.put(rno, sdc.getHistory());
   fitCol_.put(rno, sdc.getFitMap());
   return true;
@@ -1226 +1229 @@
   Vector<uInt> fmap;
   Array<Double> direction;
-  Vector<String> histo;
   Array<Int> fits;
   
@@ -1241 +1243 @@
   dirCol_.get(whichRow, direction);
   sdc.putDirection(direction);
-  histCol_.get(whichRow, histo);
-  sdc.putHistory(histo);
   fitCol_.get(whichRow, fits);
   sdc.putFitMap(fits);
@@ -1291 +1291 @@
 }
 void SDMemTable::makePersistent(const std::string& filename)
-{
+{  
   table_.deepCopy(filename,Table::New);
+
 }
 
@@ -1472 +1473 @@
   return String(oss);
 }
-
+/*
+std::string SDMemTable::scanSummary(const std::vector<int>& whichScans) {
+  ostringstream oss;
+  Vector<Int> scanIDs = scanCol_.getColumn();
+  Vector<uInt> startInt, endInt;
+  mathutil::scanBoundaries(startInt, endInt, scanIDs);
+  const uInt nScans = startInt.nelements();
+  std::vector<int>::const_iterator it(whichScans);
+  return String(oss);
+}
+*/
 Int SDMemTable::nBeam() const
 {
@@ -1498 +1509 @@
 }
 
-bool SDMemTable::appendHistory(const std::string& hist, int whichRow)
+void SDMemTable::addHistory(const std::string& hist)
+{
+  Table t = table_.rwKeywordSet().asTable("HISTORY");
+  uInt nrow = t.nrow();  
+  t.addRow();
+  ScalarColumn<String> itemCol(t, "ITEM");
+  itemCol.put(nrow, hist);
+}
+
+std::vector<std::string> SDMemTable::getHistory() const
 {
   Vector<String> history;
-  histCol_.get(whichRow, history);
-  history.resize(history.nelements()+1,True);
-  history[history.nelements()-1] = hist;
-  histCol_.put(whichRow, history);
-}
-
-std::vector<std::string> SDMemTable::history(int whichRow) const
-{
-  Vector<String> history;
-  histCol_.get(whichRow, history);
-  std::vector<std::string> stlout = mathutil::tovectorstring(history);
+  const Table& t = table_.keywordSet().asTable("HISTORY");
+  uInt nrow = t.nrow();  
+  ROScalarColumn<String> itemCol(t, "ITEM");
+  std::vector<std::string> stlout;
+  String hist;
+  for (uInt i=0; i<nrow; ++i) {
+    itemCol.get(i, hist);
+    stlout.push_back(hist);
+  }
   return stlout;
 }
 /*
-void SDMemTable::maskChannels(const std::vector<Int>& whichChans ) {
+  void SDMemTable::maskChannels(const std::vector<Int>& whichChans ) {
 
   std::vector<int>::iterator it;
@@ -1534 +1552 @@
 */
 void SDMemTable::flag(int whichRow)
-{
+  {
   Array<uChar> arr;
   flagsCol_.get(whichRow, arr);
@@ -1719 +1737 @@
 
 
-void SDMemTable::setCursorSlice(IPosition& start, IPosition& end,
+void SDMemTable::getCursorSlice(IPosition& start, IPosition& end,
                                 const IPosition& shape) const
 {

trunk/src/SDMemTable.h

@@ -192 +192 @@
   virtual std::string summary(bool verbose=false) const;
 
-  std::vector<std::string> history(int whichRow=0) const;
-  bool appendHistory(const std::string& hist, int whichRow=0);
+  // get/set the history
+  std::vector<std::string> getHistory() const;
+  void addHistory(const std::string& hist);
+
   // write to disk as aips++ table
   void makePersistent(const std::string& filename);
@@ -269 +271 @@
 
   // Generate start and end for shape and current cursor selection
-  void setCursorSlice(casa::IPosition& start, casa::IPosition& end, 
+  void getCursorSlice(casa::IPosition& start, casa::IPosition& end, 
                       const casa::IPosition& shape) const;
 
@@ -277 +279 @@
   // the underlying memory table
   casa::Table table_;
+  // The current table version
+  static const casa::uInt version_ = 1;
 
   // Cached Columns to avoid reconstructing them for each row get/put

trunk/src/SDMemTableWrapper.h

@@ -63 +63 @@
   }
 
-  //SDMemTableWrapper getScan(int scan) {
   SDMemTableWrapper getScan(std::vector<int> scan) {
     casa::String cond("SELECT FROM $1 WHERE SCANID IN ");
@@ -77 +76 @@
     cond += source;cond += "')";
     return SDMemTableWrapper(*this, cond);
+  }
+
+  SDMemTableWrapper getSQL(const std::string& sqlexpr) {
+    return SDMemTableWrapper(*this, sqlexpr);
   }
 
@@ -166 +169 @@
                                 casa::Int(whichIF));
   }
-
+  
   void spectralLines() const {table_->spectralLines();}
 
@@ -187 +190 @@
   }
   
-  std::vector<std::string> history(int whichRow=0) { 
-    return table_->history(whichRow); 
+  std::vector<std::string> getHistory() { 
+    return table_->getHistory(); 
+  }
+  void addHistory(const std::string& hist) { 
+    table_->addHistory(hist); 
   }
 

trunk/src/python_SDMemTable.cc

@@ -99 +99 @@
     .def("_setcoordinfo", &SDMemTableWrapper::setCoordInfo)
     .def("_getcoordinfo", &SDMemTableWrapper::getCoordInfo)
-    .def("_history", &SDMemTableWrapper::history,
-         (boost::python::arg("whichRow")=0) )
+    .def("_gethistory", &SDMemTableWrapper::getHistory)
+    .def("_addhistory", &SDMemTableWrapper::addHistory)
     .def("_addfit", &SDMemTableWrapper::addFit)
     .def("_getfit", &SDMemTableWrapper::getSDFitTable)