Changeset 1143 for trunk

Timestamp:

08/16/06 09:42:09 (18 years ago)

Author:

mar637

Message:

Implemented Ticket #45 as scantable.mx_quotient.

Location:

trunk

Files:

• python/scantable.py (modified) (2 diffs)
• src/STMath.cpp (modified) (2 diffs)
• src/STMath.h (modified) (3 diffs)

trunk/python/scantable.py

@@ -791 +791 @@
             in channels only - align if necessary
         Parameters:
-            one scan or comma separated  scans
             mask:     an optional mask (only used for 'var' and 'tsys'
                       weighting)
@@ -1332 +1331 @@
         return s
 
-    def mx_quotient(self, averageoff='median'):
-        """
+    def mx_quotient(self, mask = None, weight='median'):
+        """
+        Form a quotient using "off" beams when observing in "MX" mode.
+        Parameters:
+            weight:         How to average the off beams.  Default is 'median'.
         """
+        if mask is None: mask = ()
         varlist = vars()
         on = scantable(self._math._mx_extract(self, 'on'))
-        s._add_history("mx_quotient", varlist)
+        preoff = scantable(self._math._mx_extract(self, 'off'))
+        off = preoff.average_time(mask=mask, weight=weight, scanav=False)
         print_log()
         from asapmath  import quotient
-        return quotient(on, off)
+        q = quotient(on, off)
+        q._add_history("mx_quotient", varlist)
+        return q
 
     def freq_switch(self, insitu=None):

trunk/src/STMath.cpp

@@ -1328 +1328 @@
 }
 
-CountedPtr< Scantable > 
+CountedPtr< Scantable >
   asap::STMath::mxExtract( const CountedPtr< Scantable > & in,
                            const std::string & scantype )
@@ -1344 +1344 @@
   TableCopy::copyRows(tout, tab);
   if (scantype == "on") {
+    // re-index SCANNO to 0
     TableVector<uInt> vec(tout, "SCANNO");
     vec = 0;

trunk/src/STMath.h

@@ -54 +54 @@
    */
   bool insitu() const { return insitu_;};
-  
+
   /**
    * set the currnt @attr inistu state
@@ -96 +96 @@
     * @param mask an optional mask if weight allows one
     * @param weight weighting scheme
-    * @return 
+    * @return
     */
   casa::CountedPtr< Scantable >
@@ -167 +167 @@
     convertPolarisation( const casa::CountedPtr<Scantable>& in,
                          const std::string& newtype);
-  
-  casa::CountedPtr<Scantable>
-      mxExtract( const casa::CountedPtr<Scantable>& in,
-                 const std::string& scantype = "on" );
+
+  casa::CountedPtr<Scantable>
+    mxExtract( const casa::CountedPtr<Scantable>& in,
+               const std::string& srctype = "on");
 
 private: