Index: trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38763)
+++ trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38793)
@@ -350,34 +350,35 @@
         print "here4"
         sqlLine.group("obsTime", str(self.obsTime[num]))
-        sqlLine.group("FpsfFlux", "PSF_INST_FLUX / "+extTimeString)
-        sqlLine.group("FpsfFluxErr", "PSF_INST_FLUX_SIG / "+extTimeString)
-        sqlLine.group("FpsfMajorFWHM",    "PSF_FWHM_MAJ")
-        sqlLine.group("FpsfMinorFWHM",    "PSF_FWHM_MIN")
-        sqlLine.group("FpsfTheta",        "PSF_THETA")
-        sqlLine.group("FpsfCore",         "PSF_CORE")
-        sqlLine.group("FpsfQf",           "PSF_QF")
-        sqlLine.group("FpsfQfPerfect",    "PSF_QF_PERFECT")
-        sqlLine.group("FpsfChiSq",        "PSF_CHISQ")
-        sqlLine.group("FpsfLikelihood",   "psfLikelihood(EXT_NSIGMA)")
-        sqlLine.group("FmomentXX",        "MOMENTS_XX")
-        sqlLine.group("FmomentXY",        "MOMENTS_XY")
-        sqlLine.group("FmomentYY",        "MOMENTS_YY")
-        sqlLine.group("FmomentR1",        "MOMENTS_R1")
-        sqlLine.group("FmomentRH",        "MOMENTS_RH")
-        sqlLine.group("FmomentM3C",       "MOMENTS_M3C")
-        sqlLine.group("FmomentM3S",       "MOMENTS_M3S")
-        sqlLine.group("FmomentM4C",       "MOMENTS_M4C")
-        sqlLine.group("FmomentM4S",       "MOMENTS_M4S")
-        sqlLine.group("FapFlux","AP_FLUX / " + extTimeString)
-        sqlLine.group("FapFluxErr","AP_FLUX_SIG / " + extTimeString)
-        sqlLine.group("FapFillF","AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
-        sqlLine.group("FkronFlux","KRON_FLUX / " + extTimeString)
-        sqlLine.group("FkronFluxErr","KRON_FLUX_ERR / " + extTimeString )
-        sqlLine.group("FkronRad","MOMENTS_R1 * 2.5")
-        sqlLine.group("Fsky","SKY /" +extTimeString)
-        sqlLine.group("FskyErr","SKY_SIGMA / "+extTimeString)
-        sqlLine.group("FinfoFlag","FLAGS")
-        sqlLine.group("FinfoFlag2","FLAGS2")
-        sqlLine.group("processingVersion",str(self.skychunk.processingVersion))
+        sqlLine.group("FpsfFlux",          "PSF_INST_FLUX / " + extTimeString)
+        sqlLine.group("FpsfFluxErr",       "PSF_INST_FLUX_SIG / " + extTimeString)
+        sqlLine.group("FpsfMajorFWHM",     "PSF_FWHM_MAJ * abs(PLTSCALE)")
+        sqlLine.group("FpsfMinorFWHM",     "PSF_FWHM_MIN * abs(PLTSCALE)")
+        sqlLine.group("FpsfTheta",         "PSF_THETA")
+        sqlLine.group("FpsfCore",          "PSF_CORE")
+        sqlLine.group("FpsfQf",            "PSF_QF")
+        sqlLine.group("FpsfQfPerfect",     "PSF_QF_PERFECT")
+        sqlLine.group("FpsfChiSq",         "PSF_CHISQ")
+        sqlLine.group("FpsfLikelihood",    "psfLikelihood(EXT_NSIGMA)")
+        sqlLine.group("FmomentXX",         "MOMENTS_XX * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentXY",         "MOMENTS_XY * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentYY",         "MOMENTS_YY * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentR1",         "MOMENTS_R1 * abs(PLTSCALE)")
+        sqlLine.group("FmomentRH",         "MOMENTS_RH * sqrt(abs(PLTSCALE))")
+        sqlLine.group("FmomentM3C",        "MOMENTS_M3C * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentM3S",        "MOMENTS_M3S * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentM4C",        "MOMENTS_M4C * PLTSCALE * PLTSCALE")
+        sqlLine.group("FmomentM4S",        "MOMENTS_M4S * PLTSCALE * PLTSCALE")
+        sqlLine.group("FapFlux",           "AP_FLUX / " + extTimeString)
+        sqlLine.group("FapFluxErr",        "AP_FLUX_SIG / " + extTimeString)
+        sqlLine.group("FapFillF",          "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
+        sqlLine.group("FapRadius",         "AP_MAG_RADIUS")
+        sqlLine.group("FkronFlux",         "KRON_FLUX / " + extTimeString)
+        sqlLine.group("FkronFluxErr",      "KRON_FLUX_ERR / " + extTimeString )
+        sqlLine.group("FkronRad",          "MOMENTS_R1 * 2.5 * abs(PLTSCALE)")
+        sqlLine.group("Fsky",              "SKY / PLTSCALE / PLTSCALE / " + extTimeString)
+        sqlLine.group("FskyErr",           "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString)
+        sqlLine.group("FinfoFlag",         "FLAGS")
+        sqlLine.group("FinfoFlag2",        "FLAGS2")
+        sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
 
         print "got here too"
@@ -389,6 +390,4 @@
             self.logger.errorPair("failed sql: ", sql)
             raise
-
-
 
 
@@ -399,12 +398,20 @@
         self.logger.infoPair("updating","forcedWarpMeasurement_"+forcedWarpID)
         sqlLine = sqlUtility("UPDATE ForcedWarpMeasurement_"+forcedWarpID+" as a, " + self.scratchDb.dvoDetectionTable + " as b SET ")
-        sqlLine.group("a.objID","b.objID")
-        sqlLine.group("a.detectID","b.detectID")
-        sqlLine.group("a.ippObjID","b.ippObjID")
+        sqlLine.group("a.objID",      "b.objID")
+        sqlLine.group("a.detectID",   "b.detectID")
+        sqlLine.group("a.ippObjID",   "b.ippObjID")
         sqlLine.group("a.dvoRegionID","b.catID")
-        sqlLine.group("a.zp","b.zp")
+        sqlLine.group("a.zp",         "b.zp")
         sqlLine.group("a.telluricExt","b.telluricExt")
-        sqlLine.group("a.airmass","b.airmass")
-        sqlLine.group("a.FinfoFlag3","b.flags")
+        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")
+
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))
         try: self.scratchDb.execute(sql)