Changeset 38801

Timestamp:

Oct 6, 2015, 3:56:04 PM (11 years ago)

Author:

eugene

Message:

sky flux in Jy

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -373 +373 @@
             sqlLine.group("a."+filter+"nFrames",       "b.N_FRAMES")
 
-            # NOTE: sky is now in StackObjectAttributes
-            # sqlLine.group("a."+filter+"sky",           "b.SKY / " + str(exptime))
-            # sqlLine.group("a."+filter+"skyErr",        "b.SKY_SIGMA / " + str(exptime))
-
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID=b.IPP_IDET")
 
@@ -458 +454 @@
             sqlLine.group("a."+filter+"KronFluxErr",   "b.KRON_FLUX_ERR / " + str(exptime))
             sqlLine.group("a."+filter+"ApFillFac",     "b.AP_NPIX / (3.14159265359 * POW(b.AP_MAG_RADIUS - 0.5, 2))")
-#           sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
+            sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
             sqlLine.group("a."+filter+"KronRad",       "b.MOMENTS_R1 * 2.5 * b.PLTSCALE")
             sqlLine.group("a."+filter+"PlateScale",    "b.PLTSCALE")
@@ -464 +460 @@
             sqlLine.group("a."+filter+"sky",           "b.SKY / " + str(exptime))
             sqlLine.group("a."+filter+"skyErr",        "b.SKY_SIGMA / " + str(exptime))
+
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
 
@@ -469 +466 @@
                 self.scratchDb.execute(sql)
             except:
-                self.logger.errorPair('failed sql',sql)
+                self.logger.errorPair('failed sql', sql)
                 raise
 
@@ -476 +473 @@
             sqlLine.group("a."+filter+"expTime",       "b.expTime")
             sqlLine.group("a."+filter+"zp",            "b.zp")
-            sqlLine.group("a."+filter+"PSFFlux",       "a."+filter+"PSFFlux * b.zpFactor")
-            sqlLine.group("a."+filter+"PSFFluxErr",    "a."+filter+"PSFFluxErr * b.zpFactor")
-            sqlLine.group("a."+filter+"ApFlux",        "a."+filter+"ApFlux * b.zpFactor")
-            sqlLine.group("a."+filter+"ApFluxErr",     "a."+filter+"ApFluxErr * b.zpFactor")
-            sqlLine.group("a."+filter+"KronFlux",      "a."+filter+"KronFlux * b.zpFactor")
+            sqlLine.group("a."+filter+"PSFFlux",       "a."+filter+"PSFFlux     * b.zpFactor")
+            sqlLine.group("a."+filter+"PSFFluxErr",    "a."+filter+"PSFFluxErr  * b.zpFactor")
+            sqlLine.group("a."+filter+"ApFlux",        "a."+filter+"ApFlux      * b.zpFactor")
+            sqlLine.group("a."+filter+"ApFluxErr",     "a."+filter+"ApFluxErr   * b.zpFactor")
+            sqlLine.group("a."+filter+"KronFlux",      "a."+filter+"KronFlux    * b.zpFactor")
             sqlLine.group("a."+filter+"KronFluxErr",   "a."+filter+"KronFluxErr * b.zpFactor")
+
+            sqlLine.group("a."+filter+"sky",           "a."+filter+"sky         * b.zpFactor")
+            sqlLine.group("a."+filter+"skyErr",        "a."+filter+"skyErr      * b.zpFactor")
 
             # where should these go?