Changeset 1515 for branches/alma

Timestamp:

02/23/09 21:39:09 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1079)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed:
You can select stat='minpos' or 'maxpos' in scantable.stats() to
get minimum or maximum value with its channel/frequency/velocity.
Also a new method pos2data(self, rowno=0, pos=0) is added.

Test Programs:

Run scantable.stats() with stat='minpos' or 'maxpos'.

Put in Release Notes: No

Module(s): Module Names change impacts.

Description:

You can get min/max values with their position (channels/frequencies/velocities)
by selecting stat='minpos' or 'maxpos'.

The new method pos2data() returns abcissa and ordinate values of a spectrum
at an arbitrary row (rowno) and channel (pos) in the scantable.

File:

• branches/alma/python/scantable.py (modified) (5 diffs)

branches/alma/python/scantable.py

@@ -341 +341 @@
         Takes a 'mask' as an optional parameter to specify which
         channels should be excluded.
-        Parameters:
-            stat:    'min', 'max', 'sumsq', 'sum', 'mean'
-                     'var', 'stddev', 'avdev', 'rms', 'median'
+        You can get min/max values with their position
+        (channels/frequencies/velocities) by selecting stat='minpos'
+        or 'maxpos'.
+        Parameters:
+            stat:    'min', 'max', 'minpos', 'maxpos', 'sumsq', 'sum',
+                     'mean', 'var', 'stddev', 'avdev', 'rms', 'median'
             mask:    an optional mask specifying where the statistic
                      should be determined.
@@ -359 +362 @@
                              "to select individual IFs")
 
-        statvals = self._math._stats(self, mask, stat)
+        if stat.lower().find('pos') == -1:
+            statvals = self._math._stats(self, mask, stat)
+            position = False
+            sstat = str(stat)
+        else:
+            pos = self._math._minmaxpos(self, mask, stat)
+            position = True
+            statvals = []
+            sstat = stat.lower().strip('pos')
         out = ''
         axes = []
@@ -372 +383 @@
             tm = self._gettime(i)
             src = self._getsourcename(i)
+            xpos = ''
+            if position:
+                qx, y = self.pos2data(rowno=i, pos=pos[i])
+                statvals.append(y)
+                xpos = '(x = %3.3f' % (qx['value'])+' ['+qx['unit']+'])'
             out += 'Scan[%d] (%s) ' % (axis[0], src)
             out += 'Time[%s]:\n' % (tm)
@@ -377 +393 @@
             if self.nif(-1) > 1: out +=  ' IF[%d] ' % (axis[2])
             if self.npol(-1) > 1: out +=  ' Pol[%d] ' % (axis[3])
-            out += '= %3.3f\n' % (statvals[i])
+            out += '= %3.3f   ' % (statvals[i]) +xpos+'\n' 
             out +=  "--------------------------------------------------\n"
 
         if rcParams['verbose']:
             print "--------------------------------------------------"
-            print " ", stat
+            print " ", sstat
             print "--------------------------------------------------"
             print out
@@ -390 +406 @@
             #           'data': statvals}
         return statvals
+
+    def pos2data(self, rowno=0, pos=0):
+        """
+        Returns the abcissa and ordinate value of a spectrum
+        at an arbitrary row and channel in the scantable.
+        Parameters:
+            rowno:   a row number in the scantable. Default is the
+                     first row, i.e. rowno=0
+            pos:     a channel in the scantable. Default is the first
+                     channel, i.e. pos=0
+        """
+        if isinstance(rowno, int) and isinstance(pos, int):
+            x, xlbl = self.get_abcissa(rowno)
+            qx = {'unit': xlbl, 'value': x[pos]}
+            return qx, self._getspectrum(rowno)[pos]
 
     def stddev(self, mask=None):