Changeset 40278 for trunk/ippToPsps/jython/forcedwarpbatch.py

Timestamp:

Dec 12, 2017, 1:13:53 PM (9 years ago)

Author:

eugene

Message:

split zp into zpPSF and zpAPER

File:

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

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -444 +444 @@
         sqlLine.group("a.ippObjID",   "b.ippObjID")
         sqlLine.group("a.dvoRegionID","b.catID")
-        sqlLine.group("a.zp",         "b.zp")
+        sqlLine.group("a.zp",         "b.zpPSF")
         sqlLine.group("a.telluricExt","b.telluricExt")
         sqlLine.group("a.airmass",    "b.airmass")
         sqlLine.group("a.FinfoFlag3", "b.flags")
 
-        sqlLine.group("a.FpsfFlux",     "a.FpsfFlux     * b.zpFactor")
-        sqlLine.group("a.FpsfFluxErr",  "a.FpsfFluxErr  * b.zpFactor")
-        sqlLine.group("a.FapFlux",      "a.FapFlux      * b.zpFactor")
-        sqlLine.group("a.FapFluxErr",   "a.FapFluxErr   * b.zpFactor")
-        sqlLine.group("a.FkronFlux",    "a.FkronFlux    * b.zpFactor")
-        sqlLine.group("a.FkronFluxErr", "a.FkronFluxErr * b.zpFactor")
-        sqlLine.group("a.Fsky",         "a.Fsky         * b.zpFactor")
-        sqlLine.group("a.FskyErr",      "a.FskyErr      * b.zpFactor")
+        sqlLine.group("a.FpsfFlux",     "a.FpsfFlux     * b.zpFactorPSF")
+        sqlLine.group("a.FpsfFluxErr",  "a.FpsfFluxErr  * b.zpFactorPSF")
+        sqlLine.group("a.FapFlux",      "a.FapFlux      * b.zpFactorAPER")
+        sqlLine.group("a.FapFluxErr",   "a.FapFluxErr   * b.zpFactorAPER")
+        sqlLine.group("a.FkronFlux",    "a.FkronFlux    * b.zpFactorAPER")
+        sqlLine.group("a.FkronFluxErr", "a.FkronFluxErr * b.zpFactorAPER")
+        sqlLine.group("a.Fsky",         "a.Fsky         * b.zpFactorAPER")
+        sqlLine.group("a.FskyErr",      "a.FskyErr      * b.zpFactorAPER")
 
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))
@@ -576 +576 @@
 
         sqlLine = sqlUtility("UPDATE " + pspsTableName + " as a, " + self.scratchDb.dvoDetectionTable + " as b SET ")
-        sqlLine.group("a.flxR5",     "a.flxR5     * b.zpFactor")
-        sqlLine.group("a.flxR5Err",  "a.flxR5Err  * b.zpFactor")
-        sqlLine.group("a.flxR5Std",  "a.flxR5Std  * b.zpFactor")
-
-        sqlLine.group("a.flxR6",     "a.flxR6     * b.zpFactor")
-        sqlLine.group("a.flxR6Err",  "a.flxR6Err  * b.zpFactor")
-        sqlLine.group("a.flxR6Std",  "a.flxR6Std  * b.zpFactor")
-
-        sqlLine.group("a.flxR7",     "a.flxR7     * b.zpFactor")
-        sqlLine.group("a.flxR7Err",  "a.flxR7Err  * b.zpFactor")
-        sqlLine.group("a.flxR7Std",  "a.flxR7Std  * b.zpFactor")
+        sqlLine.group("a.flxR5",     "a.flxR5     * b.zpFactorAPER")
+        sqlLine.group("a.flxR5Err",  "a.flxR5Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR5Std",  "a.flxR5Std  * b.zpFactorAPER")
+
+        sqlLine.group("a.flxR6",     "a.flxR6     * b.zpFactorAPER")
+        sqlLine.group("a.flxR6Err",  "a.flxR6Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR6Std",  "a.flxR6Std  * b.zpFactorAPER")
+
+        sqlLine.group("a.flxR7",     "a.flxR7     * b.zpFactorAPER")
+        sqlLine.group("a.flxR7Err",  "a.flxR7Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR7Std",  "a.flxR7Std  * b.zpFactorAPER")
 
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))