Changeset 1015 for trunk

Timestamp:

04/18/06 15:48:53 (19 years ago)

Author:

mar637

Message:

Fix for Ticket #20 - rotateLinPolPhase wasn't workin properly. Have add deafult values to STPol constructor, also had to set the focusTable entries in STMath::applyToPol.

Location:

trunk/src

Files:

• STMath.cpp (modified) (2 diffs)
• STPol.h (modified) (1 diff)

trunk/src/STMath.cpp

@@ -153 +153 @@
       Vector<uChar> flag;
       Double inter,time;
-      cout << rec.asuInt("POLNO") << endl;
       for (uInt k = 0; k < subt.nrow(); ++k ) {
         flagCol.get(k, flag);
@@ -931 +930 @@
   cols[3] = String("CYCLENO");
   TableIterator iter(tout, cols);
-  STPol* stpol = NULL;
-  stpol =STPol::getPolClass(out->factories_, out->getPolType() );
+  STPol* stpol = STPol::getPolClass(out->factories_, out->getPolType() );
   while (!iter.pastEnd()) {
     Table t = iter.table();
     ArrayColumn<Float> speccol(t, "SPECTRA");
+    ScalarColumn<uInt> focidcol(t, "FOCUS_ID");
+    ScalarColumn<Float> parancol(t, "PARANGLE");
     Matrix<Float> pols = speccol.getColumn();
     try {
       stpol->setSpectra(pols);
+      Float fang,fhand,parang;
+      fang = in->focusTable_.getTotalFeedAngle(focidcol(0));
+      fhand = in->focusTable_.getFeedHand(focidcol(0));
+      parang = parancol(0);
+      /// @todo re-enable this
+      // disable total feed angle to support paralactifying Caswell style
+      stpol->setPhaseCorrections(parang, -parang, fhand);
       (stpol->*fptr)(phase);
       speccol.putColumn(stpol->getSpectra());
+      Matrix<Float> tmp = stpol->getSpectra();
     } catch (AipsError& e) {
       delete stpol;stpol=0;

trunk/src/STPol.h

@@ -35 +35 @@
 
   typedef  void (STPol::*polOperation)( casa::Float phase );
-  STPol() {}
+  STPol(): totalfeed_(0.0),parangle_(0.0),feedhand_(1.0) {}
   virtual ~STPol() {}