Changeset 2324 for trunk/python

Timestamp:

10/05/11 11:00:08 (13 years ago)

Author:

Malte Marquarding

Message:

Fixed bug in plotetr based statistics where median always showed nan. Need to get stats function explictly from the numpy.ma module. Also put in a filter for the stats to not show stats for annotations. Everything with a label starting with '_' gets ignored.

File:

• trunk/python/customgui_base.py (modified) (8 diffs)

trunk/python/customgui_base.py

@@ -176 +176 @@
             if self.lastspan: self._remove_span(self.lastspan)
 
-        self.lastspan = self._draw_span(self._thisregion['axes'],self._thisregion['xs'],xnow,fill="")
+        self.lastspan = self._draw_span(self._thisregion['axes'],
+                                        self._thisregion['xs'], xnow, fill="")
         del xnow
 
@@ -217 +218 @@
 
     def _subplot_stats(self,selection):
-        #from numpy import ma, ndarray
-        import numpy
         statstr = ['max', 'min', 'median', 'mean', 'sum', 'std'] #'rms']
         panelstr = selection['axes'].title.get_text()
@@ -225 +224 @@
         asaplog.post()
         for line in selection['axes'].lines:
+            # Don't include annotations
+            if line.get_label().startswith("_"):
+                continue
             label = panelstr + ", "+line.get_label()
             x = line.get_xdata()
-            selmsk = self._create_flag_from_array(x,selection['worldx'],selection['invert'])
+            newmsk = None
+            selmsk = self._create_flag_from_array(x,
+                                                  selection['worldx'],
+                                                  selection['invert'])
+            ydat = None
             y = line.get_ydata()
-            if isinstance(y,numpy.ma.masked_array):
+            if numpy.ma.isMaskedArray(y):
                 ydat = y.data
                 basemsk = y.mask
@@ -237 +243 @@
             if not isinstance(basemsk, bool):
                 # should be ndarray
-                newmsk = mask_or(selmsk,basemsk)
+                newmsk = mask_or(selmsk, basemsk)
             elif basemsk:
                 # the whole original spectrum is flagged
@@ -244 +250 @@
                 # no channel was flagged originally
                 newmsk = selmsk
-            mdata = numpy.ma.masked_array(ydat,mask=newmsk)
-            del x, y, ydat, basemsk, selmsk, newmsk
+            mdata = numpy.ma.masked_array(ydat, mask=newmsk)
             statval = {}
             for stat in statstr:
-                statval[stat] = getattr(numpy,stat)(mdata)
-            self._print_stats(statval,statstr=statstr,label=label,\
+                # need to get the stat functions from the ma module!!!
+                statval[stat] = getattr(numpy.ma,stat)(mdata)
+            self._print_stats(statval, statstr=statstr, label=label,\
                               mask=selection['worldx'],\
                               unmask=selection['invert'])
             asaplog.push(ssep)
             asaplog.post()
-            del mdata, statval
-        del ssep, panelstr
 
     def _create_flag_from_array(self,x,masklist,invert):
@@ -297 +301 @@
         sout += ("%f "*len(statstr) % tuple(statvals))
         asaplog.push(sout)
-        del sout, maskstr, masktype, statvals, key, stats, statstr, mask, label
+        #del sout, maskstr, masktype, statvals, key, stats, statstr, mask, label
 
 
@@ -1077 +1081 @@
         statval = {}
         statstr = ['max', 'min', 'mean', 'median', 'sum', 'stddev', 'rms']
-        if isinstance(rows,list) and len(rows) > 0:
+        if isinstance(rows, list) and len(rows) > 0:
             for irow in rows:
                 for stat in statstr:
@@ -1095 +1099 @@
                 for stat in statstr:
                     statval[stat] = mathobj._statsrow(scan,mask,stat,irow)[0]
-                self._print_stats(scan,irow,statval,statstr=statstr,mask=masklist)
+                self._print_stats(scan,irow,statval,statstr=statstr,
+                                  mask=masklist)
                 del irow, mask
             del srow, masklist