Changeset 6104

Timestamp:

11/12/09 13:46:27 (10 years ago)

Author:

pnorton

Message:

Fixed a bug that occurs when a completely masked dataset is selected.

Location:

qesdi/geoplot/trunk/lib/geoplot

Files:

• grid_builder_base.py (modified) (3 diffs)
• grid_builder_lat_lon_subset.py (modified) (2 diffs)

qesdi/geoplot/trunk/lib/geoplot/grid_builder_base.py

@@ -78 +78 @@
         varMin, varMax = self._getVarMinAndMax()
 
-        infValueFound = False
-        
-        if varMax == N.inf:
-            infValueFound = True
-            varMax =  self._maskInfValsInVar(self.cdmsVar).max()
-  
+        infValueFound, varMax = self._checkVarMaxForInf(varMax)
+          
         st = time.time()
         reducedVar = self._getResizedVar(xLimits, yLimits)
         log.debug("Reduced variable in %ss" % (time.time() - st,))
 
-
         st = time.time()    
         (gridBoundsX, gridBoundsY) = self._buildGridBounds(reducedVar)
@@ -102 +97 @@
         
         if infValueFound:
+            # if there was an inf value found in the full variable
+            # there may be one in the reduced one, so mask any found
             gridValues = self._maskInfValsInVar(gridValues)
-                
-        
-        
+                        
 #        log.debug("After resize:")
 #        log.debug("y midpoints min =[" + str(gridMidpointY.min()) + \
@@ -124 +119 @@
                     varMax, varMin)
 
+    def _checkVarMaxForInf(self, varMax):
+        """
+        Checks if varMax is an infinite value, if it is will compute the
+        non-infitite maximum.
+        """
+        
+        infValueFound = False
+        
+        if not hasattr(varMax, 'mask') and varMax == N.inf:
+            infValueFound = True
+            
+            # need to make sure we get the max from the non-reduced variable
+            varMax =  self._maskInfValsInVar(self.cdmsVar).max()
+            
+        return infValueFound, varMax        
+
     def _getResizedVar(self, xLimits, yLimits):
         """

qesdi/geoplot/trunk/lib/geoplot/grid_builder_lat_lon_subset.py

@@ -57 +57 @@
         varMin, varMax = self._getVarMinAndMax()
         
-        infValueFound = False
-        
-        if varMax == N.inf:
-            infValueFound = True
-            varMax =  self._maskInfValsInVar(self.cdmsVar).max()
+        infValueFound, varMax = self._checkVarMaxForInf(varMax)
 
         reducedVar = self._getResizedVar(xLimits, yLimits)
@@ -99 +95 @@
         
         if infValueFound:
+            # if there was an inf value found in the full variable
+            # there may be one in the reduced one, so mask any found
             gridValues = self._maskInfValsInVar(gridValues)