Changeset 38951 for trunk/ippToPsps/jython/scratchdb.py

Timestamp:

Oct 23, 2015, 9:50:16 AM (11 years ago)

Author:

eugene

Message:

get image zero point information from DVO Image table

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (3 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -214 +214 @@
 
     '''
+    Gets photcode (aka photoCalID from dvo table)
+    '''
+    def getImageZeroPoint(self, externID):
+
+        zeroPoint = -999
+
+        sql = "SELECT MCAL, SECZ, C_LAM, K FROM %s AS a JOIN %s as b WHERE EXTERN_ID = %s AND a.PHOTCODE = b.CODE" % (self.dvoImagesTable, self.dvoPhotcodesTable, (externID))
+        rs = self.executeQuery(sql)  
+        if not rs:
+            print "missing result set for imageID query"
+            os._exit(2)
+
+        if not rs.first():
+            self.logger.infoPair("no zero point; image is missing, imageID: ", imageID)
+            return zeroPoint
+            
+        Mcal     = rs.getFloat(1)
+        airmass  = rs.getFloat(2)
+        Clam     = rs.getFloat(3)
+        Klam     = rs.getFloat(4)
+
+        zeroPoint = 0.001*Clam + Klam*(airmass - 1.0) - Mcal
+        return zeroPoint
+
+    '''
     Updates a table with filterID grabbed from Filter init table
     '''
@@ -449 +474 @@
             " AND SOURCE_ID = " + str(sourceID)
 
-        try:
-            rs = self.executeQuery(sql)
-            
-            if not rs:
-                print "missing result set for imageID query"
-                raise
-
-            # if no returned rows, return an error
-            if not rs.next():
-                self.logger.infoPair("DVO lacks imageID ", imageID)
-                return False
-
-            if rs.getInt(1) == int(imageID):
-                # print "DVO has imageID ", imageID
-                return True
-
-            else:
-                self.logger.error("DVO has wrong imageID? ")
-                self.logger.error("imageID: ", imageID)
-                self.logger.error("EXTERN_ID: ", rs.getInt(1))
-                self.logger.infoPair("sql: ", sql)
-                raise
-
-        except:
-            print "DVO imageID query failed ", imageID
-            print "sql: ", sql
+        rs = self.executeQuery(sql)
+        if not rs:
+            print "missing result set for imageID query"
             raise
 
-        # how can I reach this?
+        # if no returned rows, return an error
+        if not rs.next():
+            self.logger.infoPair("DVO lacks imageID ", imageID)
+            return False
+
+        if rs.getInt(1) != int(imageID):
+            self.logger.error("DVO has wrong imageID? ")
+            self.logger.error("imageID: ", imageID)
+            self.logger.error("EXTERN_ID: ", rs.getInt(1))
+            self.logger.infoPair("sql: ", sql)
+            os._exit(2)
+
+        # print "DVO has imageID ", imageID
         return True
 
@@ -497 +511 @@
                EXTERN_ID INT, \
                FLAGS INT, \
+               MCAL FLOAT, \
+               SECZ FLOAT, \
                PHOTCODE SMALLINT, \
                XPIX_SYS_ERR FLOAT, \