Changeset 33098 for branches/meh_branches/ppsub_test/ippToPsps/jython/gpc1db.py

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/gpc1db.py (modified) (7 diffs)

branches/meh_branches/ppsub_test/ippToPsps/jython/gpc1db.py

@@ -32 +32 @@
 
     '''
-    TODO
-    '''
-    def getIDsInThisDVODbForThisStageFudge(self):
-
-        sql = "SELECT staticskyRun.sky_id \
-               FROM staticskyInput, staticskyRun, stackRun, staticskyResult \
-               WHERE staticskyRun.sky_id = staticskyInput.sky_id \
-               AND staticskyInput.stack_id = stackRun.stack_id \
-               AND staticskyInput.sky_id = staticskyResult.sky_id \
-               AND staticskyRun.label like 'MD04.staticsky' \
-               AND stackRun.filter like 'i%'"
-
-        try:
-            rs = self.executeQuery(sql)
-        except:
-            self.logger.exception("Can't query for ids in DVO")
-
-        ids = []
-        while (rs.next()):
-            ids.append(rs.getInt(1))
-
-        rs.close()
-
-        self.logger.debug("Found %d items in DVO database '" % (len(ids)))
-
-        return ids
-
-    '''
-    Gets a list of ids in this DVO database for this stage, could be cam or staticsky (so far)
-    '''
-    def getIDsInThisDVODbForThisStage(self, dvoDb, batchType):
+    Gets a list of ids in this DVO database for this stage, could be cam or staticsky, and a box can be defined with equatorial coordinates
+    '''
+    def getIDsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
 
         if batchType == "P2": # TODO define these someplace 
@@ -71 +43 @@
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
+                   JOIN camRun ON (stage_id = cam_id) \
+                   JOIN chipRun USING (chip_id) \
+                   JOIN rawExp USING (exp_id) \
                    WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND minidvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
-                   AND addRun.state = 'full'"
+                   AND addRun.state = 'full' \
+                   AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
+                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ")"
 
         elif batchType == "ST":       
 
             stage = "staticsky"
-            sql = "SELECT DISTINCT stack_id \
-                   FROM staticskyInput \
+            sql = "SELECT DISTINCT stack_id FROM staticskyInput \
                    JOIN addRun ON(staticskyInput.sky_id = addRun.stage_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
@@ -90 +66 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full'"
-            
+
         try:
             rs = self.executeQuery(sql)
@@ -154 +130 @@
             rs = self.executeQuery(sql)
             rs.first()
+        except:
+            self.logger.errorPair("Can't query for", "stack meta data")
+           
+        try:
             meta.append(rs.getString(1))
             meta.append(rs.getString(2))
             meta.append(rs.getString(3))
         except:
-            self.logger.exception("Can't query for stack meta")
-
+            self.logger.errorPair("getStackStageMeta()", "empty meta data")
+     
         return meta
 
@@ -178 +158 @@
             rs = self.executeQuery(sql)
             rs.first()
+        except:
+            self.logger.errorPair("Can't query for", "camera meta data")
+
+        try:
             meta.append(rs.getInt(1))
             meta.append(rs.getString(2))
@@ -185 +169 @@
             meta.append(rs.getString(6))
         except:
-            self.logger.exception("Can't query for camera meta")
+            self.logger.errorPair("getCameraStageMeta()", "empty meta data")
 
         return meta
@@ -205 +189 @@
             rs.first()
         except:
-            self.logger.exception("Can't query for camera smfs")
-
+            self.logger.errorPair("Can't query for smf file for cam_id",  str(camID))
+            return None
+
+        try:
         # get path to base dir of cmf files
-        path = rs.getString(1)
-        path = path[0:path.rfind("/")]
+            path = rs.getString(1)
+            path = path[0:path.rfind("/")]
+        except:
+            self.logger.errorPair("No smf files found for cam_id", str(camID) )
+            return None
        
         # list all smf files if a neb path