Changeset 959 for trunk/src

Timestamp:

03/31/06 17:07:18 (19 years ago)

Author:

mar637

Message:

c++ side of Ticket #7; update as requested in Ticket #8 and last revision

File:

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

trunk/src/Scantable.cpp

@@ -90 +90 @@
   historyTable_ = STHistory(*this);
   table_.rwKeywordSet().defineTable("HISTORY", historyTable_.table());
-  setupFitTable();
-  fitTable_ = table_.keywordSet().asTable("FITS");
+  fitTable_ = STFit(*this);
+  table_.rwKeywordSet().defineTable("FIT", fitTable_.table());
   originalTable_ = table_;
   attach();
@@ -237 +237 @@
 }
 
-void Scantable::setupFitTable()
-{
-  TableDesc td("", "1", TableDesc::Scratch);
-  td.addColumn(ScalarColumnDesc<uInt>("FIT_ID"));
-  td.addColumn(ArrayColumnDesc<String>("FUNCTIONS"));
-  td.addColumn(ArrayColumnDesc<Int>("COMPONENTS"));
-  td.addColumn(ArrayColumnDesc<Double>("PARAMETERS"));
-  td.addColumn(ArrayColumnDesc<Bool>("PARMASK"));
-  td.addColumn(ArrayColumnDesc<String>("FRAMEINFO"));
-  SetupNewTable aNewTab("fits", td, Table::Scratch);
-  Table aTable(aNewTab, Table::Memory);
-  table_.rwKeywordSet().defineTable("FITS", aTable);
-}
 
 void Scantable::attach()
@@ -621 +608 @@
       uInt row = uInt(whichrow);
       stpol->setSpectra(getPolMatrix(row));
-      Float frot,fang,ftan;
-      focusTable_.getEntry(frot, fang, ftan, mfocusidCol_(row));
-      stpol->setPhaseCorrections(frot, fang, ftan);
+      Float fang,fhand,parang;
+      fang = focusTable_.getTotalFeedAngle(mfocusidCol_(row));
+      fhand = focusTable_.getFeedHand(mfocusidCol_(row));
+      parang = paraCol_(row);
+      /// @todo re-enable this
+      // disable total feed angle to support paralactifying Caswell style
+      stpol->setPhaseCorrections(parang, -parang, fhand);
       arr = stpol->getSpectrum(requestedpol, ptype);
       delete stpol;