Changeset 972 for trunk/src

Timestamp:

04/03/06 15:07:08 (19 years ago)

Author:

mar637

Message:

Completed Ticket #7 - storing of fits.

Location:

trunk/src

Files:

• STFiller.cpp (modified) (1 diff)
• STFit.cpp (modified) (3 diffs)
• STFit.h (modified) (2 diffs)
• STFitEntry.cpp (modified) (2 diffs)
• STFitEntry.h (modified) (1 diff)
• Scantable.cpp (modified) (10 diffs)
• Scantable.h (modified) (3 diffs)
• ScantableWrapper.h (modified) (1 diff)
• python_STFitEntry.cpp (modified) (3 diffs)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/STFiller.cpp

@@ -227 +227 @@
     TableRow row(table_->table());
     TableRecord& rec = row.record();
+    RecordFieldPtr<Int> fitCol(rec, "FIT_ID");
+    *fitCol = -1;
     RecordFieldPtr<uInt> scanoCol(rec, "SCANNO");
     *scanoCol = scanNo-1;

trunk/src/STFit.cpp

@@ -84 +84 @@
 {
   uInt rno = table_.nrow();
-  uInt resultid;
+  uInt resultid = 0;
   bool foundentry = false;
+  // replace
   if ( id > -1 ) {
     Table t = table_(table_.col("ID") == id );
@@ -94 +95 @@
     }
   }
+  // doesn't exist
   if ( rno > 0  && !foundentry ) {
     idCol_.get(rno-1, resultid);
     resultid++;
   }
-  if ( !foundentry )table_.addRow();
-
+  // add new row if new id
+  if ( !foundentry ) table_.addRow();
+  cout << rno << "   " << resultid << endl;
   funcCol_.put(rno, mathutil::toVectorString(fit.getFunctions()));
   compCol_.put(rno, Vector<Int>(fit.getComponents()));
@@ -109 +112 @@
 }
 
-void STFit::getEntry( STFitEntry& fit, uInt id )
+void STFit::getEntry( STFitEntry& fit, uInt id ) const
 {
   Table t = table_(table_.col("ID") == Int(id) );

trunk/src/STFit.h

@@ -39 +39 @@
 
   casa::uInt addEntry( const STFitEntry& fit, casa::Int id=-1 );
-  void getEntry( STFitEntry& fit, casa::uInt id );
+  void getEntry( STFitEntry& fit, casa::uInt id ) const;
 
   const casa::String& name() const { return name_; }
@@ -46 +46 @@
   void setup();
   static const casa::String name_;
-  //casa::Table table_;
   casa::ArrayColumn<casa::String> funcCol_;
   casa::ArrayColumn<casa::Int> compCol_;

trunk/src/STFitEntry.cpp

@@ -2 +2 @@
 // C++ Implementation: STFitEntry
 //
-// Description: 
+// Description:
 //
 //
@@ -17 +17 @@
 {
 }
+STFitEntry::STFitEntry(const STFitEntry& other)
+{
+  if ( this != &other ) {
+    this->functions_ = other.functions_;
+    this->components_ = other.components_;
+    this->parameters_ = other.parameters_;
+    this->parmasks_ = other.parmasks_;
+    this->frameinfo_ = other.frameinfo_;
+  }
+}
 
 

trunk/src/STFitEntry.h

@@ -26 +26 @@
 public:
   STFitEntry();
-  
+  STFitEntry(const STFitEntry& other);
+
   ~STFitEntry();
-  
+
   void setFunctions(const std::vector<std::string>& f)
     { functions_ = f; }

trunk/src/Scantable.cpp

@@ -94 +94 @@
   originalTable_ = table_;
   attach();
+  TableVector<Int> v(table_,"FIT_ID");v=666;
+  table_.flush();
+  Vector<Int> v2 = mfitidCol_.getColumn();cout << v2 << endl;
 }
 
@@ -153 +156 @@
   t = table_.rwKeywordSet().asTable("HISTORY");
   TableCopy::copyRows(t, other.historyTable_.table());
+  t = table_.rwKeywordSet().asTable("FIT");
+  TableCopy::copyRows(t, other.fitTable_.table());
 }
 
@@ -163 +168 @@
   moleculeTable_ = STMolecules(table_);
   historyTable_ = STHistory(table_);
+  fitTable_ = STFit(table_);
 }
 
@@ -183 +189 @@
   td.addColumn(ScalarColumnDesc<uInt>("BEAMNO"));
   td.addColumn(ScalarColumnDesc<uInt>("IFNO"));
+  // linear, circular, stokes
   td.rwKeywordSet().define("POLTYPE", String("linear"));
   td.addColumn(ScalarColumnDesc<uInt>("POLNO"));
@@ -188 +195 @@
   td.addColumn(ScalarColumnDesc<uInt>("FREQ_ID"));
   td.addColumn(ScalarColumnDesc<uInt>("MOLECULE_ID"));
-  // linear, circular, stokes [I Q U V], stokes1 [I Plinear Pangle V]
   td.addColumn(ScalarColumnDesc<Int>("REFBEAMNO"));
 
@@ -223 +229 @@
 
   td.addColumn(ScalarColumnDesc<uInt>("TCAL_ID"));
-  td.addColumn(ScalarColumnDesc<uInt>("FIT_ID"));
+  ScalarColumnDesc<Int> fitColumn("FIT_ID");
+  fitColumn.setDefault(Int(666));
+  td.addColumn(fitColumn);
 
   td.addColumn(ScalarColumnDesc<uInt>("FOCUS_ID"));
@@ -234 +242 @@
   table_ = Table(aNewTab, type_, 0);
   originalTable_ = table_;
-
 }
 
@@ -259 +266 @@
 
   mfitidCol_.attach(table_,"FIT_ID");
-  //fitidCol_.attach(fitTable_,"FIT_ID");
-
   mfreqidCol_.attach(table_, "FREQ_ID");
-
   mtcalidCol_.attach(table_, "TCAL_ID");
-
   mfocusidCol_.attach(table_, "FOCUS_ID");
-
   mmolidCol_.attach(table_, "MOLECULE_ID");
 }
@@ -841 +843 @@
     Vector<String> wau(1);wau = u.getName();
     spc.setWorldAxisUnits(wau);
-
     s = CoordinateUtil::axisLabel(spc,0,True,True,False);
   }
@@ -895 +896 @@
 {
   return MEpoch::castType(timeCol_.getMeasRef().getType());
-  }
-
+}
+
+void asap::Scantable::addFit( const STFitEntry & fit, int row )
+{
+  cout << mfitidCol_(uInt(row)) << endl;
+  uInt id = fitTable_.addEntry(fit, mfitidCol_(uInt(row)));
+  mfitidCol_.put(uInt(row), id);
+}
 
 } //namespace asap

trunk/src/Scantable.h

@@ -41 +41 @@
 #include "STPol.h"
 #include "STFit.h"
+#include "STFitEntry.h"
 
 namespace asap {
@@ -306 +307 @@
   STMolecules& molecules() { return moleculeTable_; }
   STHistory& history() { return historyTable_; }
+  STFit& fit() { return fitTable_; }
 
   std::vector<std::string> columnNames() const;
+
+  void addFit(const STFitEntry& fit, int row);
+  STFitEntry getFit(int row) const
+    { STFitEntry fe; fitTable_.getEntry(fe, mfitidCol_(row)); return fe; }
 
 private:
@@ -393 +399 @@
 
   casa::ArrayColumn<casa::String> histitemCol_;
-  casa::ScalarColumn<casa::uInt> mfitidCol_;
-  // id in weather table and main table
+  casa::ScalarColumn<casa::Int> mfitidCol_;
   casa::ScalarColumn<casa::uInt> mweatheridCol_;
 

trunk/src/ScantableWrapper.h

@@ -166 +166 @@
   void addHistory(const std::string& hist)
     { table_->addHistory(hist); }
-  /*
-  void addFit(int whichrow, const std::vector<double>& p,
-              const std::vector<bool>& m, const std::vector<string>& f,
-              const std::vector<int>& c) {
 
-    casa::Vector<casa::Double> p2(p);
-    casa::Vector<casa::Bool> m2(m);
-    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));
-  }
-  */
+  void addFit(const STFitEntry& fit, int row)
+    { table_->addFit(fit, row); }
+
+  STFitEntry getFit(int whichrow) const
+  { return table_->getFit(whichrow); }
+
   void calculateAZEL() { table_->calculateAZEL(); };
 

trunk/src/python_STFitEntry.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #include <boost/python.hpp>
@@ -41 +41 @@
       class_<STFitEntry>("fitentry")
         .def( init <> () )
+        .def( init < const STFitEntry& > () )
         .def("getfixedparameters", &STFitEntry::getParmasks)
         .def("getparameters", &STFitEntry::getParameters)
@@ -46 +47 @@
         .def("getcomponents", &STFitEntry::getComponents)
         .def("getframeinfo", &STFitEntry::getFrameinfo)
+        .def("setfixedparameters", &STFitEntry::setParmasks)
+        .def("setparameters", &STFitEntry::setParameters)
+        .def("setfunctions", &STFitEntry::setFunctions)
+        .def("setcomponents", &STFitEntry::setComponents)
+        .def("setframeinfo", &STFitEntry::setFrameinfo)
       ;
     };

trunk/src/python_Scantable.cpp

@@ -103 +103 @@
     .def("_getselection", &ScantableWrapper::getSelection)
     .def("_setselection", &ScantableWrapper::setSelection)
-    /*
     .def("_addfit", &ScantableWrapper::addFit)
-    .def("_getfit", &ScantableWrapper::getSDFitTable)
-    */
+    .def("_getfit", &ScantableWrapper::getFit)
     .def("_recalcazel", &ScantableWrapper::calculateAZEL)
   ;