Changeset 40274

Timestamp:

Dec 12, 2017, 11:01:55 AM (9 years ago)

Author:

eugene

Message:

split zp into zpPSF and zpAPER

File:

• trunk/ippToPsps/jython/diffbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -457 +457 @@
         sqlLine.group("a.raErr",       "b.raErr")   # NOTE: This is supplied above as well, is this needed??
         sqlLine.group("a.decErr",      "b.decErr") # NOTE: This is supplied above as well, is this needed??
-        sqlLine.group("a.zp",          "b.zp")
+        sqlLine.group("a.zp",          "b.zpPSF")
         sqlLine.group("a.telluricExt", "b.telluricExt")
         sqlLine.group("a.airmass",     "b.airmass")
@@ -633 +633 @@
                a.ra           = b.ra, \
                a.dec          = b.dec_, \
-               a.zp           = b.zp, \
+               a.zp           = b.zpPSF, \
                a.telluricExt  = b.telluricExt, \
                a.airmass      = b.airmass, \
                a.expTime      = b.expTime, \
                a.DinfoFlag3   = b.flags  \
-               a.DpsfFlux     = a.DpsfFlux    * b.zpFactor, \
-               a.DpsfFluxErr  = a.DpsfFluxErr * b.zpFactor, \
-               a.apFlux       = a.apFlux      * b.zpFactor, \
-               a.apFluxErr    = a.apFluxErr   * b.zpFactor, \
-               a.kronFlux     = a.kronFlux    * b.zpFactor, \
-               a.kronFluxErr  = a.kronFluxErr * b.zpFactor  \
-               a.sky          = a.sky         * b.zpFactor, \
-               a.skyErr       = a.skyErr      * b.zpFactor  \
+               a.DpsfFlux     = a.DpsfFlux    * b.zpFactorPSF, \
+               a.DpsfFluxErr  = a.DpsfFluxErr * b.zpFactorPSF, \
+               a.apFlux       = a.apFlux      * b.zpFactorAPER, \
+               a.apFluxErr    = a.apFluxErr   * b.zpFactorAPER, \
+               a.kronFlux     = a.kronFlux    * b.zpFactorAPER, \
+               a.kronFluxErr  = a.kronFluxErr * b.zpFactorAPER  \
+               a.sky          = a.sky         * b.zpFactorAPER, \
+               a.skyErr       = a.skyErr      * b.zpFactorAPER  \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)