Changeset 36201 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Oct 9, 2013, 4:53:45 PM (13 years ago)

Author:

heather

Message:

added feature of time range for P2/ST - doesnt work for ST yet, queue those seperately

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (2 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -49 +49 @@
     NB this uses Bill's potentially temporary 'skycells' database when finding RA/Dec for stacks.
     '''
-    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
+    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999, tstart="0000-00-00 00:00:00", tend = "0000-00-00 00:00:00"):
 
         self.logger.debugPair("GPC1 RA range", "%.2f -> %.2f" % (minRA, maxRA))
         self.logger.debugPair("GPC1 Dec range", "%.2f -> %.2f" % (minDec, maxDec))
-
+        
         rows = []
 
@@ -80 +80 @@
                    AND addRun.state = 'full' \
                    AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
-                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ")"
+                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ") \
+                   AND dateobs >= '" + tstart + "'\
+                   AND dateobs <= '" + tend  + "'"
 
         elif batchType == "ST":