Changeset 927 for MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py

Timestamp:

02/26/12 23:30:01 (15 months ago)

Author:

jjr8

Message:

Implemented the rest of #521: Tools that generate rasters should also (optionally) generate a raster catalog

Files:

• MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py (modified) (2 diffs)

MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py

@@ -211 +211 @@
         return data.reshape(data.shape[0], data.shape[2], data.shape[3]), noDataValue
 
-    def _GetOtherTimeCoordinates(self, queryableAttributeValues):
+    def _GetTimeCoordsFromQueryableAttributeValues(self, queryableAttributeValues):
         if u'DateTime' not in queryableAttributeValues or not isinstance(queryableAttributeValues[u'DateTime'], datetime.datetime):
-            return [None, None]
+            return [None, None, None]
+        import numpy
         try:
-            i = self.CenterCoords['t', :].index(queryableAttributeValues[u'DateTime'])
+            i = numpy.where(self.CenterCoords['t', :] == queryableAttributeValues[u'DateTime'])[0][0]
         except:
-            return [None, None]
-        return [self.MinCoords['t', i], self.MaxCoords['t', i]]
+            return [None, None, None]
+        return [self.MinCoords['t', i], queryableAttributeValues[u'DateTime'], self.MaxCoords['t', i] - datetime.timedelta(seconds=1)]
 
     @classmethod
@@ -322 +323 @@
             workspace.ImportDatasets(GridSliceCollection(grid, tQACoordType=u'center').QueryDatasets(), mode, calculateStatistics=calculateStatistics, buildPyramids=buildPyramids)
             if rasterCatalog is not None:
-                workspace.ToRasterCatalog(rasterCatalog, grid.GetSpatialReference(u'ArcGIS'), tQACoordType=u'center', tCoordFunction=self._GetOtherTimeCoordinates, overwriteExisting=True)
+                workspace.ToRasterCatalog(rasterCatalog, grid.GetSpatialReference(u'ArcGIS'), tQACoordType=u'center', tCoordFunction=fullGrid._GetTimeCoordsFromQueryableAttributeValues, overwriteExisting=True)
         finally:
             fullGrid.Close()