Merge pull request #1028 from UV-CDAT/issue_1024_vcs_mean_use_cdutil_…

…averager enhanced 'Mean' attribute on vcs plots
CDAT · Feb 11, 2015 · e85c16f · e85c16f
2 parents 7b363f4 + 3ed2771
commit e85c16f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Packages/vcs/Lib/template.py b/Packages/vcs/Lib/template.py
@@ -34,6 +34,7 @@
 from Pdata import *
 from types import *
 import inspect
+import cdutil
 
 ## Following for class properties
 def _getgen(self,name):
@@ -1239,9 +1240,15 @@ def plot(self,x,slab,gm,bg=0,min=None,max=None,X=None,Y=None,**kargs):
                   tt.string='Max %g' % smx
                 elif s=='mean':
                     if not inspect.ismethod(getattr(slab,'mean')):
-                         tt.string='Mean '+str(getattr(slab,s))
+                         meanstring='Mean '+str(getattr(slab,s))
                     else:
-                         tt.string='Mean %f'%slab.mean()
+                        try:
+                         #slices = [slice(0,1),] * (slab.ndim -2 )
+                         meanstring='Mean %.4g'% float(cdutil.averager(slab,
+                                 axis = " ".join(["(%s)" % S for S in slab.getAxisIds()])))
+                        except Exception,err:
+                         meanstring='Mean %.4g'%slab.mean()
+                    tt.string=meanstring
                 else :
                     tt.string=str(getattr(slab,s))
                 tt.x=[sub.x]