Changeset 972 for trunk/src/Scantable.cpp

Timestamp:

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

Author:

mar637

Message:

Completed Ticket #7 - storing of fits.

File:

• trunk/src/Scantable.cpp (modified) (10 diffs)

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