Index: /trunk/ippToPsps/jython/diffbatch.py
===================================================================
--- /trunk/ippToPsps/jython/diffbatch.py	(revision 38782)
+++ /trunk/ippToPsps/jython/diffbatch.py	(revision 38783)
@@ -276,12 +276,10 @@
         sqlLine.group("diffDetMetaID",            str(diffSkyFileID));                                                
 
-#        sqlLine.group("randomDiffID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
         sqlLine.group("randomDiffID",     "RAND("+str(self.batchID)+")")                       
         sqlLine.group("filterID",        str(self.filterID[num]))                                        
         sqlLine.group("surveyID",        str(self.surveyID))         
         sqlLine.group("skycellID",       str(self.skycellID[num]))
-##        sqlLine.group("obsTime",         str(self.obsTime))     
         sqlLine.group("expTime",         str(self.expTime[num]))
-        sqlLine.group("obsTime", str(self.obsTime[num]))
+        sqlLine.group("obsTime",         str(self.obsTime[num]))
         sqlLine.group("xPos",            "X_PSF")                                                   
         sqlLine.group("yPos",            "Y_PSF")                                                   
@@ -291,17 +289,16 @@
             sqlLine.group("pltScale",        "PLTSCALE")                                      
             sqlLine.group("posAngle",        "POSANGLE")                                      
-#            sqlLine.group("raErr",           "X_PSF_SIG * abs(PLTSCALE)") 
-#            sqlLine.group("decErr",          "Y_PSF_SIG * abs(PLTSCALE)") 
+            sqlLine.group("raErr",           "X_PSF_SIG * abs(PLTSCALE)") 
+            sqlLine.group("decErr",          "Y_PSF_SIG * abs(PLTSCALE)") 
         else:
             sqlLine.group("pltScale",        "0.257")                                      
             sqlLine.group("posAngle",        "-999")                                      
-#            sqlLine.group("raErr",           "X_PSF_SIG * 0.257") 
-#            sqlLine.group("decErr",          "Y_PSF_SIG * 0.257") 
+            sqlLine.group("raErr",           "X_PSF_SIG * 0.257") 
+            sqlLine.group("decErr",          "Y_PSF_SIG * 0.257") 
         sqlLine.group("DpsfFlux",         "PSF_INST_FLUX / " + extTimeString)
         sqlLine.group("DpsfFluxErr",      "PSF_INST_FLUX_SIG / " + extTimeString)
-#        if (self.id >= 982483):   #we don't have PSF_FWHM_MAJ or MIN or PSF_CORE
-#            sqlLine.group("psfMajorFWHM",    "PSF_FWHM_MAJ")                                               
-#            sqlLine.group("psfMinorFWHM",    "PSF_FWHM_MIN")                                               
-#            sqlLine.group("psfCore",         "PSF_CORE")                                                    
+        sqlLine.group("DpsfMajorFWHM",    "PSF_FWHM_MAJ * abs(PLTSCALE)")                                               
+        sqlLine.group("DpsfMinorFWHM",    "PSF_FWHM_MIN * abs(PLTSCALE)")                                               
+        sqlLine.group("DpsfCore",         "PSF_CORE")                                                    
         sqlLine.group("DpsfTheta",        "PSF_THETA")                                               
         sqlLine.group("DpsfQf",           "PSF_QF")                                                  
@@ -309,32 +306,32 @@
         sqlLine.group("DpsfChiSq",        "PSF_CHISQ")                                     
         sqlLine.group("DpsfLikelihood",   "psfLikelihood(EXT_NSIGMA)")                               
-        sqlLine.group("DmomentXX",        "MOMENTS_XX")                                              
-        sqlLine.group("DmomentXY",        "MOMENTS_XY")                                              
-        sqlLine.group("DmomentYY",        "MOMENTS_YY")                                              
-        sqlLine.group("DmomentR1",        "MOMENTS_R1")                                              
-        sqlLine.group("DmomentRH",        "MOMENTS_RH")                                              
-#        sqlLine.group("DmomentM3C",       "MOMENTS_M3C")                                             
-#        sqlLine.group("DmomentM3S",       "MOMENTS_M3S")                                             
-#        sqlLine.group("DmomentM4C",       "MOMENTS_M4C")                                             
-#        sqlLine.group("DmomentM4S",       "MOMENTS_M4S")                                             
+        sqlLine.group("DmomentXX",        "MOMENTS_XX * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("DmomentXY",        "MOMENTS_XY * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("DmomentYY",        "MOMENTS_YY * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("DmomentR1",        "MOMENTS_R1 * abs(PLTSCALE)")                                              
+        sqlLine.group("DmomentRH",        "MOMENTS_RH * sqrt(abs(PLTSCALE))")                                              
+        sqlLine.group("DmomentM3C",       "MOMENTS_M3C * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("DmomentM3S",       "MOMENTS_M3S * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("DmomentM4C",       "MOMENTS_M4C * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("DmomentM4S",       "MOMENTS_M4S * PLTSCALE * PLTSCALE")                                             
         if (self.id >= 982483):
             sqlLine.group("DapFlux",          "AP_FLUX / " + extTimeString)
             sqlLine.group("DapFluxErr",       "AP_FLUX_SIG / " + extTimeString)
- #           sqlLine.group("DapFillF",         "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
- #       sqlLine.group("DapRadius",        "AP_MAG_RADIUS")
+#           sqlLine.group("DapFillF",         "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
+#       sqlLine.group("DapRadius",        "AP_MAG_RADIUS")
         sqlLine.group("DkronFlux",        "KRON_FLUX / " + extTimeString)
         sqlLine.group("DkronFluxErr",     "KRON_FLUX_ERR / " + extTimeString)
-        sqlLine.group("DkronRad",         "MOMENTS_R1 * 2.5")
+        sqlLine.group("DkronRad",         "MOMENTS_R1 * 2.5 * abs(PLTSCALE)")
         sqlLine.group("diffNPos",         "DIFF_NPOS")
-        sqlLine.group("diffFRatio",         "DIFF_FRATIO")
+        sqlLine.group("diffFRatio",       "DIFF_FRATIO")
         sqlLine.group("diffNBad",         "DIFF_NRATIO_BAD")
-        sqlLine.group("diffNMask",         "DIFF_NRATIO_MASK")
+        sqlLine.group("diffNMask",        "DIFF_NRATIO_MASK")
         sqlLine.group("diffNAll",         "DIFF_NRATIO_ALL")
-        sqlLine.group("diffPdist",         "DIFF_R_P")
-        sqlLine.group("diffNdist",         "DIFF_R_M")
-        sqlLine.group("diffPSN",         "DIFF_SN_P")
-        sqlLine.group("diffNSN",         "DIFF_SN_M")
-        sqlLine.group("Dsky",             "SKY  / " + extTimeString)
-        sqlLine.group("DskyErr",          "SKY_SIGMA  / " + extTimeString)
+        sqlLine.group("diffPdist",        "DIFF_R_P")
+        sqlLine.group("diffNdist",        "DIFF_R_M")
+        sqlLine.group("diffPSN",          "DIFF_SN_P")
+        sqlLine.group("diffNSN",          "DIFF_SN_M")
+        sqlLine.group("Dsky",             "SKY / PLTSCALE / PLTSCALE / " + extTimeString)
+        sqlLine.group("DskyErr",          "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString)
         sqlLine.group("DinfoFlag",        "FLAGS")                          
         sqlLine.group("DinfoFlag2",       "FLAGS2")                          
@@ -491,5 +488,13 @@
                a.airmass      = b.airmass, \
                a.expTime      = b.expTime, \
-               a.DinfoFlag3    = b.flags  \
+               a.DinfoFlag3   = b.flags  \
+               a.psfFlux      = a.psfFlux     * b.zpFactor, \
+               a.psfFluxErr   = a.psfFluxErr  * 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  \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)