Changeset 457 for trunk

Timestamp:

02/16/05 12:40:39 (20 years ago)

Author:

kil064

Message:

move SDMemTable::rotateXYPhase to SDMath

Location:

trunk/src

Files:

• SDMath.cc (modified) (2 diffs)
• SDMath.h (modified) (1 diff)
• SDMathWrapper.cc (modified) (2 diffs)
• SDMathWrapper.h (modified) (1 diff)
• SDMemTable.cc (modified) (2 diffs)
• SDMemTable.h (modified) (1 diff)
• SDMemTableWrapper.h (modified) (1 diff)
• python_SDMath.cc (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDMath.cc

@@ -83 +83 @@
 
 #include "SDMath.h"
+#include "SDPol.h"
 
 using namespace casa;
@@ -1214 +1215 @@
 
 
+void SDMath::rotateXYPhase (SDMemTable& in, Float value, Bool doAll)
+//
+// phase in degrees
+// Applies to all Beams and IFs
+// Might want to optionally select on Beam/IF
+//
+{
+   if (in.nPol() != 4) {
+      throw(AipsError("You must have 4 polarizations to run this function"));
+   }
+//    
+   const Table& tabIn = in.table();
+   ArrayColumn<Float> specCol(tabIn,"SPECTRA");  
+   IPosition start(asap::nAxes,0);
+   IPosition end(asap::nAxes);
+
+// Set cursor slice. Assumes shape the same for all rows
+ 
+   setCursorSlice (start, end, doAll, in);
+   IPosition start3(start);
+   start3(asap::PolAxis) = 2;                 // Real(XY)
+   IPosition end3(end);
+   end3(asap::PolAxis) = 2;   
+//
+   IPosition start4(start);
+   start4(asap::PolAxis) = 3;                 // Imag (XY)
+   IPosition end4(end);
+   end4(asap::PolAxis) = 3;
+//  
+   uInt nRow = in.nRow();
+   Array<Float> data;
+   for (uInt i=0; i<nRow;++i) {
+      specCol.get(i,data);
+      IPosition shape = data.shape();
+ 
+// Get polarization slice references
+  
+      Array<Float> C3 = data(start3,end3);
+      Array<Float> C4 = data(start4,end4);
+    
+// Rotate
+ 
+      SDPolUtil::rotateXYPhase(C3, C4, value);
+   
+// Put
+    
+      specCol.put(i,data);
+   }
+}     
+
 
 

trunk/src/SDMath.h

@@ -124 +124 @@
    SDMemTable* averagePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask,
                           const casa::String& wtStr) const;
+
+// Rotate XY phase
+   void rotateXYPhase (SDMemTable& in, casa::Float value, casa::Bool doAll);
+
 
  private:

trunk/src/SDMathWrapper.cc

@@ -82 +82 @@
 
 
-
 void SDMathWrapper::addInSitu(SDMemTableWrapper& in, float offset, bool doAll)
 {
@@ -272 +271 @@
 }
 
+void SDMathWrapper::rotateXYPhaseInSitu(SDMemTableWrapper& in, float angle, bool doAll)
+{
+  SDMemTable* pIn = in.getPtr();
+  SDMath sdm;
+  sdm.rotateXYPhase(*pIn, Float(angle), Bool(doAll));
+}
+
+
+
+
 void SDMathWrapper::opacityInSitu(SDMemTableWrapper& in, float tau, bool doAll)
 {

trunk/src/SDMathWrapper.h

@@ -94 +94 @@
                                        const std::string& method, bool perFreqID);
 
+// XY Phase rotation
+  void rotateXYPhaseInSitu(SDMemTableWrapper& in, float angle, bool doAll);
+
 // Apply opacity correction
   void opacityInSitu (SDMemTableWrapper& in, float tau, bool doAll);

trunk/src/SDMemTable.cc

@@ -64 +64 @@
 #include "MathUtils.h"
 #include "SDPol.h"
+
 
 
@@ -1671 +1672 @@
 
 
-void SDMemTable::rotateXYPhase (Float value, Bool doAll)
-  // phase in degrees
-  // Applies to all Beams and IFs
-  // Might want to optionally select on Beam/IF
-{
-  if (nPol() != 4) {
-    throw(AipsError("You must have 4 polarizations to run this function"));
-  }
-  
-  IPosition start(asap::nAxes,0);
-  IPosition end(asap::nAxes);
-  
-  uInt nRow = specCol_.nrow();
-  Array<Float> data;
-  for (uInt i=0; i<nRow;++i) {
-    specCol_.get(i,data);
-    IPosition shape = data.shape();
-    
-    // Set slice
-    if (!doAll) {
-      setCursorSlice (start, end, shape);
-    } else {
-      end = shape-1;
-    }
-
-    // Get polarization slice references
-    start(asap::PolAxis) = 2;
-    end(asap::PolAxis) = 2;
-    Array<Float> C3 = data(start,end);
-    
-    start(asap::PolAxis) = 3;
-    end(asap::PolAxis) = 3;
-    Array<Float> C4 = data(start,end);
-    
-    // Rotate
-    SDPolUtil::rotateXYPhase(C3, C4, value);
-    
-    // Put
-    specCol_.put(i,data);
-  }
-}
-
 void SDMemTable::setCursorSlice(IPosition& start, IPosition& end,
                                 const IPosition& shape) const

trunk/src/SDMemTable.h

@@ -236 +236 @@
 // Get global antenna position
   casa::MPosition getAntennaPosition() const;
-
-// Rotate phase of XY correlation by specified value (degrees)
-  void rotateXYPhase (casa::Float angle, casa::Bool doAll);
 
 // Helper function to check instrument (antenna) name and give enum

trunk/src/SDMemTableWrapper.h

@@ -205 +205 @@
   }
 
-  void rotateXYPhase (float value, bool doAll) {
-      table_->rotateXYPhase(value, doAll);
-  }
-
 private:
   casa::CountedPtr<SDMemTable> table_;

trunk/src/python_SDMath.cc

@@ -101 +101 @@
 //
       def("stats", &SDMathWrapper::statistic);
+// 
+      def ("rotate_xyphase", &SDMathWrapper::rotateXYPhaseInSitu);
     };
 

trunk/src/python_SDMemTable.cc

@@ -62 +62 @@
     .def("setbeam", &SDMemTableWrapper::setBeam)
     .def("setpol", &SDMemTableWrapper::setPol)
-    .def("_rotate_xyphase", &SDMemTableWrapper::rotateXYPhase)
     .def("_setmask", &SDMemTableWrapper::setMask)
     .def("get_fluxunit", &SDMemTableWrapper::getFluxUnit)