Changeset 1530 for branches

Timestamp:

03/13/09 16:27:14 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1079)

Ready to Release: Yes

Interface Changes: Yes for scantable.stats()

What Interface Changed:
Return value is now a list of abcissa values
when stat='min_abc' and 'max_abc'.

Test Programs:

run scantable.stats() with the parameter stat='min_abc' or 'max_abc'.

Put in Release Notes: No

Module(s): sdstat

Description:

scantable.stats() are modified so that the tool returns abscissa
chan/freq/velocity of min or max when stat='min_abc' or 'max_abc',
respectively.
Minor changes in IPosition mathutil::minMaxPos() to accept both
min (max) and min_abc (max_abc) as a parameter.

Location:

branches/alma

Files:

• python/scantable.py (modified) (5 diffs)
• src/MathUtils.cpp (modified) (1 diff)

branches/alma/python/scantable.py

@@ -345 +345 @@
         Takes a 'mask' as an optional parameter to specify which
         channels should be excluded.
-        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',
@@ -365 +362 @@
                              "number of channels. Please use setselection() "
                              "to select individual IFs")
-
-        if stat.lower().find('_abc') == -1:
-            statvals = self._math._stats(self, mask, stat)
-            getchan = False
-            sstat = str(stat)
-        else:
+        rtnabc = False
+        if stat.lower().endswith('_abc'): rtnabc = True
+        getchan = False
+        if stat.lower().startswith('min') or stat.lower().startswith('max'): 
             chan = self._math._minmaxchan(self, mask, stat)
             getchan = True
             statvals = []
-            sstat = stat.lower().strip('_abc')
+        if not rtnabc: statvals = self._math._stats(self, mask, stat)
+
         out = ''
         axes = []
@@ -387 +383 @@
             tm = self._gettime(i)
             src = self._getsourcename(i)
-            xpos = ''
+            refstr = ''
+            statunit= ''
             if getchan:
                 qx, qy = self.chan2data(rowno=i, chan=chan[i])
-                statvals.append(qy['value'])
-                xpos = '(x = %3.3f' % (qx['value'])+' ['+qx['unit']+'])'
+                if rtnabc:
+                    statvals.append(qx['value'])
+                    refstr = '(value: %3.3f' % (qy['value'])+' ['+qy['unit']+'])'
+                    statunit= '['+qx['unit']+']'
+                else:
+                    refstr = '(@ %3.3f' % (qx['value'])+' ['+qx['unit']+'])'
+                    #statunit= ' ['+qy['unit']+']'
             out += 'Scan[%d] (%s) ' % (axis[0], src)
             out += 'Time[%s]:\n' % (tm)
@@ -397 +399 @@
             if self.nif(-1) > 1: out +=  ' IF[%d] ' % (axis[2])
             if self.npol(-1) > 1: out +=  ' Pol[%d] ' % (axis[3])
-            out += '= %3.3f   ' % (statvals[i]) +xpos+'\n' 
+            out += '= %3.3f   ' % (statvals[i]) +refstr+'\n' 
             out +=  "--------------------------------------------------\n"
 
         if rcParams['verbose']:
             print "--------------------------------------------------"
-            print " ", sstat
+            print " ", stat, statunit
             print "--------------------------------------------------"
             print out
@@ -422 +424 @@
         """
         if isinstance(rowno, int) and isinstance(chan, int):
-            x, xlbl = self.get_abcissa(rowno)
-            qx = {'unit': xlbl, 'value': x[chan]}
+            qx = {'unit': self.get_unit(),
+                  'value': self._getabcissa(rowno)[chan]}
             qy = {'unit': self.get_fluxunit(),
                   'value': self._getspectrum(rowno)[chan]}

branches/alma/src/MathUtils.cpp

@@ -84 +84 @@
    String str(which);
    str.upcase();
-   if (str.matches(String("MIN_ABC"))) {
+   if (str.contains(String("MIN"))) {
      return minPos;
-   } else if (str.matches(String("MAX_ABC"))) {
+   } else if (str.contains(String("MAX"))) {
      return maxPos;
    } else {