Changeset 798 for branches

Timestamp:

12/22/05 11:55:22 (19 years ago)

Author:

phi196

Message:

Added swap_pol & invert_phase

Location:

branches/Release12

Files:

• python/__init__.py (modified) (1 diff)
• python/scantable.py (modified) (1 diff)
• src/SDMath.cc (modified) (2 diffs)
• src/SDMath.h (modified) (1 diff)
• src/SDMathWrapper.cc (modified) (1 diff)
• src/SDMathWrapper.h (modified) (1 diff)
• src/python_SDMath.cc (modified) (1 diff)

branches/Release12/python/__init__.py

@@ -353 +353 @@
             rotate_linpolphase - rotate the phase of the complex
                                  polarization O=Q+iU correlation
+            invert_phase    - take the complex conjugate of the cross correlation
+            swap_pol        - swap the order of the parallel polarisations
             freq_switch     - perform frequency switching on the data
             stats           - Determine the specified statistic, e.g. 'min'

branches/Release12/python/scantable.py

@@ -1268 +1268 @@
         return
 
+    def invert_phase(self, allaxes=None):
+        """
+        Take the complex conjugate of the complex polarisation cross
+        correlation.  This is always done in situ in the data.  If
+        you call this function twice, you end up with the original phase
+        Parameters:
+            allaxes: If True apply to all spectra. Otherwise
+                     apply only to the selected (beam/pol/if)spectra only.
+                     The default is taken from .asaprc (True if none)
+        Examples:
+            scan.invert_phase()
+        """
+        if allaxes is None: allaxes = rcParams['scantable.allaxes']
+        varlist = vars()
+        from asap._asap import _invert_phase
+        _invert_phase(self, allaxes)
+        self._add_history("invert_phase", varlist)
+        print_log()
+        return
+
+    def swap_ppol(self, allaxes=None):
+        """
+        Swaps the order of parallel polarisation products (ie AA, BB
+        becomes BB, AA) .  This is always done in situ in the data.
+        If you call this function twice, you end up with the original
+        order
+        Parameters:
+            allaxes: If True apply to all spectra. Otherwise
+                     apply only to the selected (beam/pol/if)spectra only.
+                     The default is taken from .asaprc (True if none)
+        Examples:
+            scan.swap_pol()
+        """
+        if allaxes is None: allaxes = rcParams['scantable.allaxes']
+        varlist = vars()
+        from asap._asap import _swap_pol
+        _swap_pol(self, allaxes)
+        self._add_history("swap_phase", varlist)
+        print_log()
+        return
+
 
     def add(self, offset, insitu=None, allaxes=None):

branches/Release12/src/SDMath.cc

@@ -1425 +1425 @@
 
       // Invert
-      C4 = -C4
+      C4 *= -1.0f;
 
       // Put
@@ -1483 +1483 @@
 // Swap
 
-      Array<Float> tmp = C1;
+      Array<Float> tmp;
+      tmp = C1;
       C1 = C2;
       C2 = C1;

branches/Release12/src/SDMath.h

@@ -137 +137 @@
    void rotateLinPolPhase(SDMemTable& in, casa::Float value, casa::Bool doAll);
 
+// Complex conjugate of phase
+   void invertPhase(SDMemTable& in, casa::Bool doAll);
+
+// Swap polarisation order
+   void swapPol(SDMemTable& in, casa::Bool doAll);
   
  private:

branches/Release12/src/SDMathWrapper.cc

@@ -278 +278 @@
 }
 
+void SDMathWrapper::invertPhaseInSitu(SDMemTableWrapper& in, bool doAll)
+{
+  SDMemTable* pIn = in.getPtr();
+  
+  sdmath.invertPhase(*pIn, Bool(doAll));
+}
+
+void SDMathWrapper::swapPolInSitu(SDMemTableWrapper& in, bool doAll)
+{
+  SDMemTable* pIn = in.getPtr();
+  
+  sdmath.swapPol(*pIn, Bool(doAll));
+}
+
 
 void SDMathWrapper::rotateLinPolPhaseInSitu(SDMemTableWrapper& in, float angle, bool doAll)

branches/Release12/src/SDMathWrapper.h

@@ -109 +109 @@
   void rotateLinPolPhaseInSitu(SDMemTableWrapper& in, float angle, bool doAll);
 
+// Complex conjugate of phase
+   void invertPhaseInSitu(SDMemTableWrapper& in, bool doAll);
+
+// Swap polarisation order
+   void swapPolInSitu(SDMemTableWrapper& in, bool doAll);
+
 // Apply opacity correction
   void opacityInSitu(SDMemTableWrapper& in, float tau, bool doAll);

branches/Release12/src/python_SDMath.cc

@@ -106 +106 @@
       def("_rotate_linpolphase", &SDMathWrapper::rotateLinPolPhaseInSitu);
 
+      def("_invert_phase", &SDMathWrapper::invertPhaseInSitu);
+      def("_swap_pol", &SDMathWrapper::swapPolInSitu);
+
+
       def("_frequency_switch", &SDMathWrapper::frequencySwitch);
       def("_frequency_switch_insitu", &SDMathWrapper::frequencySwitchInSitu);