Changeset 1517 for branches/alma

Timestamp:

02/24/09 14:22:57 (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:
Name of function scantable.pos2data() changed to scantable.chan2data().
And names of selection for the parameter stat are changed in scantable.stats().
NEW: OLD:
min_abc minpos
max_abc maxpos

Test Programs:

You can get min/max values with their position (channels/frequencies/velocities)

by selecting stat='min_abc' or 'max_abc'.

Put in Release Notes: No

Module(s): scantable.stats()

Description:

Change in names for a function and parameters.

File:

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

branches/alma/python/scantable.py

@@ -341 +341 @@
         Takes a 'mask' as an optional parameter to specify which
         channels should be excluded.
-        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',
+        You can get min/max values with their
+        channels/frequencies/velocities by selecting stat='min_abc'
+        or 'max_abc'.
+        Parameters:
+            stat:    'min', 'max', 'min_abc', 'max_abc', 'sumsq', 'sum',
                      'mean', 'var', 'stddev', 'avdev', 'rms', 'median'
             mask:    an optional mask specifying where the statistic
@@ -362 +362 @@
                              "to select individual IFs")
 
-        if stat.lower().find('pos') == -1:
+        if stat.lower().find('_abc') == -1:
             statvals = self._math._stats(self, mask, stat)
-            position = False
+            getchan = False
             sstat = str(stat)
         else:
-            pos = self._math._minmaxpos(self, mask, stat)
-            position = True
+            chan = self._math._minmaxchan(self, mask, stat)
+            getchan = True
             statvals = []
-            sstat = stat.lower().strip('pos')
+            sstat = stat.lower().strip('_abc')
         out = ''
         axes = []
@@ -384 +384 @@
             src = self._getsourcename(i)
             xpos = ''
-            if position:
-                qx, y = self.pos2data(rowno=i, pos=pos[i])
-                statvals.append(y)
+            if getchan:
+                qx, qy = self.chan2data(rowno=i, chan=chan[i])
+                statvals.append(qy['value'])
                 xpos = '(x = %3.3f' % (qx['value'])+' ['+qx['unit']+'])'
             out += 'Scan[%d] (%s) ' % (axis[0], src)
@@ -407 +407 @@
         return statvals
 
-    def pos2data(self, rowno=0, pos=0):
-        """
-        Returns the abcissa and ordinate value of a spectrum
+    def chan2data(self, rowno=0, chan=0):
+        """
+        Returns channel/frequency/velocity and spectral value
         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
+            chan:    a channel in the scantable. Default is the first
                      channel, i.e. pos=0
         """
-        if isinstance(rowno, int) and isinstance(pos, int):
+        if isinstance(rowno, int) and isinstance(chan, int):
             x, xlbl = self.get_abcissa(rowno)
-            qx = {'unit': xlbl, 'value': x[pos]}
-            return qx, self._getspectrum(rowno)[pos]
+            qx = {'unit': xlbl, 'value': x[chan]}
+            qy = {'unit': self.get_fluxunit(),
+                  'value': self._getspectrum(rowno)[chan]}
+            return qx, qy
 
     def stddev(self, mask=None):