Changeset 465

Timestamp:

02/17/05 14:46:17 (19 years ago)

Author:

mar637

Message:

Added SDFitTable to handle fits and expose them to python vi the sdfit class.

Location:

trunk/src

Files:

• Makefile (modified) (3 diffs)
• MathUtils.cc (modified) (2 diffs)
• MathUtils.h (modified) (5 diffs)
• SDContainer.cc (modified) (1 diff)
• SDContainer.h (modified) (1 diff)
• SDMemTable.cc (modified) (8 diffs)
• SDMemTable.h (modified) (3 diffs)
• SDMemTableWrapper.h (modified) (2 diffs)
• python_SD.cc (modified) (1 diff)
• python_SD.h (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/Makefile

@@ -45 +45 @@
              SDAttr.o \
              SDContainer.o \
+             SDFitTable.o \
              SDPol.o \
              SDPol2.o \
@@ -62 +63 @@
              python_SDMath.o \
              python_SDFitter.o \
+             python_SDFitTable.o \
              python_SDLineFinder.o \
              python_SD.o
@@ -69 +71 @@
              SDAttr.h \
              SDContainer.h \
+             SDFitTable.h \
              SDMemTable.h \
              SDPol.h \

trunk/src/MathUtils.cc

@@ -34 +34 @@
 #include <casa/Arrays/MaskedArray.h>
 #include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/VectorSTLIterator.h>
 #include <casa/BasicSL/String.h>
 
@@ -107 +108 @@
   endInt.resize(j+1,True);
 }
+
+std::vector<std::string> mathutil::tovectorstring(const Vector<String>& in) 
+{
+  std::vector<std::string> out;
+  VectorSTLIterator<String> it(in);
+  for (uInt i=0; it != in.end(); ++it,++i) {
+    out.push_back(*it);
+  }
+  return out;
+}
+
+Vector<String> mathutil::toVectorString(const std::vector<std::string>& in) 
+{
+  Vector<String> out(in.size());
+  uInt i=0;
+  std::vector<std::string>::const_iterator it;
+  for (it=in.begin();it != in.end();++it,++i) {
+    out[i] = casa::String(*it);
+  }
+  return out;
+}

trunk/src/MathUtils.h

@@ -32 +32 @@
 #define MATHUTILS_H
 
+#include <string>
+#include <vector>
 #include <casa/aips.h>
 #include <casa/Arrays/Vector.h>
+#include <casa/BasicSL/String.h>
 
 namespace mathutil {
@@ -42 +45 @@
 
 // Find the scan boundaries from a list of ScanIDs
-void scanBoundaries (casa::Vector<casa::uInt>& startInt,  
-                     casa::Vector<casa::uInt>& endInt,
-                     const casa::Vector<casa::Int>& scanIDs);
+void scanBoundaries(casa::Vector<casa::uInt>& startInt,  
+                    casa::Vector<casa::uInt>& endInt,
+                    const casa::Vector<casa::Int>& scanIDs);
 
 // Hanning smoothing
@@ -50 +53 @@
 void hanning(casa::Vector<T>& out, casa::Vector<casa::Bool>& outmask, 
              const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask, 
-             casa::Bool relaxed=False, casa::Bool ignoreOther=False);
+             casa::Bool relaxed=casa::False, 
+             casa::Bool ignoreOther=casa::False);
 
 // Generate specified statistic
@@ -58 +62 @@
 // Replace masked value by zero
 void replaceMaskByZero(casa::Vector<casa::Float>& data, 
-                        const casa::Vector<casa::Bool>& mask);
+                       const casa::Vector<casa::Bool>& mask);
 
 // Extend the 
@@ -64 +68 @@
 void extendLastArrayAxis(casa::Array<T>& out, const casa::Array<T>& in,
                          const T& initVal);
+  
+std::vector<std::string> tovectorstring(const casa::Vector<casa::String>& in);
+
+casa::Vector<casa::String> toVectorString(const std::vector<std::string>& in);
 
 };

trunk/src/SDContainer.cc

@@ -582 +582 @@
 }
 
-// SDFitTable
-
-
-const Vector<Double>& SDFitTable::getFitParameters(uInt whichRow) const
-{
-  if (whichRow <= n_)
-    return fitParms_[whichRow];
-}
-
-const Vector<Bool>& SDFitTable::getFitParameterMask(uInt whichRow) const
-{
-  if (whichRow <= n_)
-    return parMask_[whichRow];
-}
-
-const Vector<Int>& SDFitTable::getFitComponents(uInt whichRow) const
-{
-  if (whichRow <= n_)
-    return fitComps_[whichRow];
-}
-
-const Vector<String>& SDFitTable::getFitFunctions(uInt whichRow) const
-{
-  if (whichRow <= n_)
-    return fitFuncs_[whichRow];
-}
-
-void SDFitTable::putFitParameters(uInt whichRow, const Vector<Double>& arr)
-{
-  if (whichRow <= n_)
-    fitParms_[whichRow] = arr;
-}
-
-void SDFitTable::putFitParameterMask(uInt whichRow, const Vector<Bool>& arr)
-{
-  if (whichRow <= n_)
-    parMask_[whichRow] = arr;
-}
-
-void SDFitTable::putFitComponents(uInt whichRow, const Vector<Int>& arr)
-{
-  if (whichRow <= n_)
-    fitComps_[whichRow] = arr;
-}
-void SDFitTable::putFitFunctions(uInt whichRow, const Vector<String>& arr)
-{
-  if (whichRow <= n_)
-    fitFuncs_[whichRow] = arr;
-}
-
-
 // SDDataDesc
 

trunk/src/SDContainer.h

@@ -261 +261 @@
 };
 
-class SDFitTable {
-public:
-  // Create a FitTable with "n" rows
-  SDFitTable(casa::uInt n=0) : n_(n) {;};
-  
-  casa::uInt length() const { return n_; };
-  const casa::Vector<casa::Double>& getFitParameters(casa::uInt which) const;
-  const casa::Vector<casa::Bool>& getFitParameterMask(casa::uInt which) const;
-  const casa::Vector<casa::String>& getFitFunctions(casa::uInt which) const;
-  const casa::Vector<casa::Int>& getFitComponents(casa::uInt which) const;
-
-  void putFitParameters(casa::uInt whichRow, 
-                        const casa::Vector<casa::Double>& arr);
-  void putFitParameterMask(casa::uInt whichRow,
-                           const casa::Vector<casa::Bool>& arr);
-  void putFitFunctions(casa::uInt whichRow, 
-                       const casa::Vector<casa::String>& arr);
-  void putFitComponents(casa::uInt whichRow, 
-                        const casa::Vector<casa::Int>& arr);
-
-private:
-  
-  casa::uInt n_;
-  casa::Vector<casa::Vector<casa::Double> > fitParms_;
-  // (npars,nrows)
-  casa::Vector<casa::Vector<casa::Bool> > parMask_;
-  // the fit function names (nnames,nrows)
-  casa::Vector<casa::Vector<casa::String> > fitFuncs_;
-  // the number of components of the function (ncomps, nrows)
-  casa::Vector<casa::Vector<casa::Int> > fitComps_;
-
-};
 
 } // namespace

trunk/src/SDMemTable.cc

@@ -60 +60 @@
 
 #include "SDDefs.h"
-#include "SDMemTable.h"
 #include "SDContainer.h"
 #include "MathUtils.h"
 #include "SDPol.h"
 
-
+#include "SDMemTable.h"
 
 using namespace casa;
@@ -206 +205 @@
   tdf.addColumn(ArrayColumnDesc<Double>("PARAMETERS"));
   tdf.addColumn(ArrayColumnDesc<Bool>("PARMASK"));
+  tdf.addColumn(ArrayColumnDesc<String>("FRAMEINFO"));
   SetupNewTable fittab("fits", tdf, Table::New);
   Table fitTable(fittab, Table::Memory);
@@ -948 +948 @@
   td.addColumn(ArrayColumnDesc<Double>("PARAMETERS"));
   td.addColumn(ArrayColumnDesc<Bool>("PARMASK"));
+  td.addColumn(ArrayColumnDesc<String>("FRAMEINFO"));
   SetupNewTable aNewTab("fits", td, Table::New);
   Table aTable(aNewTab, Table::Memory);
@@ -954 +955 @@
   ArrayColumn<Double> sc2(aTable, "PARAMETERS");
   ArrayColumn<Bool> sc3(aTable, "PARMASK");
+  ArrayColumn<String> sc4(aTable, "FRAMEINFO");
   for (uInt i; i<sdft.length(); ++i) {
-    const Vector<Double>& parms = sdft.getFitParameters(i);
-    const Vector<Bool>& parmask = sdft.getFitParameterMask(i);
-    const Vector<String>& funcs = sdft.getFitFunctions(i);
-    const Vector<Int>& comps = sdft.getFitComponents(i);
+    const Vector<Double>& parms = sdft.getParameters(i);
+    const Vector<Bool>& parmask = sdft.getParameterMask(i);
+    const Vector<String>& funcs = sdft.getFunctions(i);
+    const Vector<Int>& comps = sdft.getComponents(i);
+    const Vector<String>& finfo = sdft.getFrameInfo(i);
     sc0.put(i,funcs);
     sc1.put(i,comps);
     sc3.put(i,parmask);
     sc2.put(i,parms);
+    sc4.put(i,finfo);
   }
   table_.rwKeywordSet().defineTable("FITS", aTable);
@@ -974 +978 @@
   Vector<Bool> parmask;
   Vector<String> funcs;
+  Vector<String> finfo;
   Vector<Int> comps;  
   ROArrayColumn<Double> parmsCol(t, "PARAMETERS");
@@ -979 +984 @@
   ROArrayColumn<Int> compsCol(t, "COMPONENTS");
   ROArrayColumn<String> funcsCol(t, "FUNCTIONS");
+  ROArrayColumn<String> finfoCol(t, "FRAMEINFO");
   uInt n = t.nrow();
-  SDFitTable sdft(n);
+  SDFitTable sdft;
   for (uInt i=0; i<n; ++i) {
     parmaskCol.get(i, parmask);
-    sdft.putFitParameterMask(i, parmask);
     parmsCol.get(i, parms);
-    sdft.putFitParameters(i, parms);
     funcsCol.get(i, funcs);
-    sdft.putFitFunctions(i, funcs);
     compsCol.get(i, comps);
-    sdft.putFitComponents(i, comps);
+    finfoCol.get(i, finfo);
+    sdft.addFit(parms, parmask, funcs, comps, finfo);
   }
   return sdft;
 }
 
+SDFitTable SDMemTable::getSDFitTable(uInt whichRow) const {
+  Array<Int> fitid;
+  fitCol_.get(whichRow, fitid);
+  if (fitid.nelements() == 0) return SDFitTable();
+
+  IPosition shp = fitid.shape();
+  IPosition start(4, beamSel_, IFSel_, polSel_,0);
+  IPosition end(4, beamSel_, IFSel_, polSel_, shp[3]-1);
+
+  // reform the output array slice to be of dim=1
+  Vector<Int> tmp = (fitid(start, end)).reform(IPosition(1,shp[3]));
+
+  const Table& t = table_.keywordSet().asTable("FITS");
+  Vector<Double> parms;
+  Vector<Bool> parmask;
+  Vector<String> funcs;
+  Vector<String> finfo;
+  Vector<Int> comps;    
+  ROArrayColumn<Double> parmsCol(t, "PARAMETERS");
+  ROArrayColumn<Bool> parmaskCol(t, "PARMASK");
+  ROArrayColumn<Int> compsCol(t, "COMPONENTS");
+  ROArrayColumn<String> funcsCol(t, "FUNCTIONS");
+  ROArrayColumn<String> finfoCol(t, "FRAMEINFO");
+  if (t.nrow() == 0) return SDFitTable();
+  SDFitTable sdft;
+  Int k=-1;
+  for (uInt i=0; i< tmp.nelements(); ++i) {
+    k = tmp[i];
+    if ( k > -1 && k < t.nrow() ) {
+      parms.resize();
+      parmsCol.get(k, parms);
+      parmask.resize();
+      parmaskCol.get(k, parmask);
+      funcs.resize();
+      funcsCol.get(k, funcs);
+      comps.resize();
+      compsCol.get(k, comps);
+      finfo.resize();
+      finfoCol.get(k, finfo);
+      sdft.addFit(parms, parmask, funcs, comps, finfo);
+    }
+  }
+  return sdft;
+}
 
 void SDMemTable::addFit(uInt whichRow,
@@ -1009 +1057 @@
   ArrayColumn<Int> compsCol(t, "COMPONENTS");
   ArrayColumn<String> funcsCol(t, "FUNCTIONS");
+  ArrayColumn<String> finfoCol(t, "FRAMEINFO");
   parmsCol.put(nrow, p);
   parmaskCol.put(nrow, m);
   compsCol.put(nrow, c);
   funcsCol.put(nrow, f);
+  Vector<String> fi = mathutil::toVectorString(getCoordInfo());
+  finfoCol.put(nrow, fi);
 
   Array<Int> fitarr;
@@ -1432 +1483 @@
   Vector<String> history;
   histCol_.get(whichRow, history);
-  std::vector<std::string> stlout;
-  // there is no Array<String>.tovector(std::vector<std::string>), so
-  // do it by hand
-  for (uInt i=0; i<history.nelements(); ++i) {
-    stlout.push_back(history[i]);
-  }
+  std::vector<std::string> stlout = mathutil::tovectorstring(history);
   return stlout;
 }

trunk/src/SDMemTable.h

@@ -45 +45 @@
 
 #include "SDDefs.h"
-
-
+#include "SDFitTable.h"
 
 namespace asap {
@@ -243 +242 @@
   bool putSDFitTable(const SDFitTable& sdft);
   SDFitTable getSDFitTable() const;
+  SDFitTable getSDFitTable(casa::uInt whichRow) const;
 
   void addFit(casa::uInt whichRow,
@@ -249 +249 @@
               const casa::Vector<casa::String>& f, 
               const casa::Vector<casa::Int>& c);
+
   
 private:

trunk/src/SDMemTableWrapper.h

@@ -36 +36 @@
 #include <casa/Arrays/Vector.h>
 
+#include "MathUtils.h"
+#include "SDFitTable.h"
 #include "SDMemTable.h"
 
@@ -195 +197 @@
     casa::Vector<casa::Double> p2(p);
     casa::Vector<casa::Bool> m2(m); 
-    casa::Vector<casa::String> f2(f.size());
-    casa::uInt i=0;
-    std::vector<std::string>::const_iterator it;
-    for (it=f.begin();it != f.end();++it) {
-      f2[i] = casa::String(*it);
-    }
+    casa::Vector<casa::String> f2 = mathutil::toVectorString(f);
     casa::Vector<casa::Int> c2(c);
     table_->addFit(casa::uInt(whichRow), p2,m2,f2,c2);
   }
+  SDFitTable getSDFitTable(int whichRow) {
+    return table_->getSDFitTable(casa::uInt(whichRow));
+  }
+
 
 private:

trunk/src/python_SD.cc

@@ -59 +59 @@
   asap::python::python_SDMath();
   asap::python::python_SDFitter();
+  asap::python::python_SDFitTable();
   asap::python::python_SDLineFinder();
 

trunk/src/python_SD.h

@@ -42 +42 @@
     void python_SDMath();
     void python_SDFitter();
+    void python_SDFitTable();
     void python_SDLineFinder();
 

trunk/src/python_SDMemTable.cc

@@ -102 +102 @@
          (boost::python::arg("whichRow")=0) )
     .def("_addfit", &SDMemTableWrapper::addFit)
+    .def("_getfit", &SDMemTableWrapper::getSDFitTable)
   ;
 };