Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/gpc1db.py

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/gpc1db.py

@@ -87 +87 @@
 
             stage = "skycal"
-            sql = "SELECT DISTINCT stack_id, radeg, decdeg FROM skycalRun \
+            sql = "SELECT DISTINCT sky_id, radeg, decdeg FROM skycalRun \
                    JOIN addRun ON(skycalRun.skycal_id = addRun.stage_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
@@ -107 +107 @@
                    AND mjd_obs >= (to_days('" + tstart + "')-678941) \
                    AND mjd_obs <= (to_days('" + tend + "') - 678941) "
-            self.logger.infoPair("sql",sql)      
-        try:
-            # XXX EAM : test output
-            rs = self.executeQuery(sql)
-            while (rs.next()): 
-               rows.append([rs.getInt(1), rs.getFloat(2), rs.getFloat(3)])
-            rs.close()
+           # self.logger.infoPair("sql",sql)      
+        elif batchType == "DF":
+
+            stage = "diff"
+            sql = "SELECT stuff from stufftable"
+
+        elif batchType == "FW":
+            
+            stage = "forcedwarp"
+            sql = "SELECT differentStuff from Stufftable"
+
+        try:
+            rs = self.executeQuery(sql)
+
         except:
             self.logger.exception("Can't query for ids in DVO")
             self.logger.infoPair("failed sql:", sql)
-            return rows
+            sys.exit(1)
+
+        while (rs.next()): 
+            rows.append([rs.getInt(1), rs.getFloat(2), rs.getFloat(3)])
+
+        rs.close()
 
         self.logger.debug("Found %d items in DVO database '%s' for stage='%s'" % (len(rows), dvoDb, stage))
@@ -329 +341 @@
 
 
-        # XXX EAM : test output
         self.logger.infoPair("smf files:", files)
         if len(files) < 1: return None
@@ -388 +399 @@
 
         # print "staring stack stage cmf"
-
+        #self.logger.infoPair("in stackstagecmf - sql is: ", sql) 
         # get single path base for the directory containing all cmf files, one of which is hopefully for our stack_id
         try:
@@ -489 +500 @@
 
 
+    '''
+    grabs the stackID for a particular skyId, filter, and dvodb
+    the mapping of stack_id from sky_id is not unique unless
+    joined to the dvodb 
+    '''
+    def getStackIDFromSkyIDAndFilter(self,dvoDb,skyID,filter):
+
+        self.logger.infoPair("finding stack_ids from gpc1 for sky_id ", skyID)
+
+        sql = "SELECT DISTINCT stack_id from skycalRun \
+               JOIN addRun ON(skycalRun.skycal_id = addRun.stage_id) \
+               JOIN minidvodbRun USING(minidvodb_name) \
+               JOIN minidvodbProcessed USING(minidvodb_id) \
+               JOIN mergedvodbRun USING(minidvodb_id) \
+               JOIN mergedvodbProcessed USING(merge_id) \
+               JOIN stackRun USING (stack_id) \
+               WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
+               AND minidvodbRun.state = 'merged' \
+               AND minidvodbProcessed.fault = 0 \
+               AND mergedvodbRun.state = 'full' \
+               AND mergedvodbProcessed.fault = 0  \
+               AND addRun.stage = 'skycal' \
+               AND addRun.state = 'full' \
+               AND filter = '" + filter + "' \
+               AND sky_id = %d" % skyID 
+
+#        self.logger.infoPair("sql",sql)
+
+        try:
+            rs = self.executeQuery(sql)
+                         
+        except:    
+            self.logger.exception("can't query for stackid in DVO")
+            self.logger.infoPair("failed sql:", sql)
+            return 0
+
+        rs.first()
+        try:
+            stackid = rs.getInt(1)
+            self.logger.infoPair("found stack_ID", stackid)
+        except:
+            stackid = -999
+            self.logger.infoPair("using stack_ID",stackid)
+            
+        return stackid