Changeset 40483 for branches/czw_branch/20170908/ippToPsps/jython/scratchdb.py

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

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

branches/czw_branch/20170908/ippToPsps/jython/scratchdb.py

@@ -271 +271 @@
         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))
+        # MCAL_PSF, MCAL_APER, SECZ are from dvoImagesTabl
+        # C_LAM, K are from dvoPhotcodeTable
+        sql = "SELECT MCAL_PSF, 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:
@@ -288 +290 @@
         zeroPoint = 0.001*Clam + Klam*(airmass - 1.0) - Mcal
         return zeroPoint
+
+    '''
+    Gets zero point for image (PSF and APER)
+    '''
+    def getStackZeroPoint(self, externID):
+
+        zeroPointPSF  = -999
+        zeroPointAPER = -999
+
+        # MCAL_PSF, MCAL_APER, SECZ are from dvoImagesTabl
+        # C_LAM, K are from dvoPhotcodeTable
+        sql = "SELECT MCAL_PSF, MCAL_APER, 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, externID: ", externID)
+            return zeroPoint
+            
+        McalPSF  = rs.getFloat(1)
+        McalAPER = rs.getFloat(2)
+        airmass  = rs.getFloat(3)
+        Clam     = rs.getFloat(4)
+        Klam     = rs.getFloat(5)
+
+        zeroPointPSF  = 0.001*Clam + Klam*(airmass - 1.0) - McalPSF
+        zeroPointAPER = 0.001*Clam + Klam*(airmass - 1.0) - McalAPER
+        return (zeroPointPSF, zeroPointAPER)
 
     '''
@@ -576 +608 @@
                EXTERN_ID INT, \
                FLAGS INT, \
-               MCAL FLOAT, \
+               MCAL_PSF FLOAT, \
+               MCAL_APER FLOAT, \
                SECZ FLOAT, \
                PHOTCODE SMALLINT, \
@@ -607 +640 @@
                raErr FLOAT, \
                decErr FLOAT, \
-               zp FLOAT, \
-               zpFactor FLOAT, \
+               zpPSF FLOAT, \
+               zpFactorPSF FLOAT, \
+               zpAPER FLOAT, \
+               zpFactorAPER FLOAT, \
                telluricExt FLOAT, \
                airmass FLOAT, \
@@ -620 +655 @@
                flags INT, \
                objflags INT, \
+               filtflags INT, \
                PRIMARY KEY (imageID, ippDetectID), \
                KEY (objID, detectID), \