Index: trunk/ippToPsps/jython/diffbatch.py
===================================================================
--- trunk/ippToPsps/jython/diffbatch.py	(revision 38602)
+++ trunk/ippToPsps/jython/diffbatch.py	(revision 38736)
@@ -185,5 +185,4 @@
        
 
-       self.calibModNum = 0;
        self.dataRelease = skychunk.dataRelease;
         
@@ -238,5 +237,4 @@
         self.scratchDb.updateAllRows("DiffMeta_"+str(num), "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("DiffMeta_"+str(num), self.filterName[num][0])
-        self.scratchDb.updateAllRows("DiffMeta_"+str(num), "calibModNum", str(self.calibModNum))
         self.scratchDb.updateAllRows("DiffMeta_"+str(num), "dataRelease", str(self.skychunk.dataRelease))
         self.logger.infoPair("DiffMeta_"+str(num),"done")
@@ -301,32 +299,32 @@
 #            sqlLine.group("raErr",           "X_PSF_SIG * 0.257") 
 #            sqlLine.group("decErr",          "Y_PSF_SIG * 0.257") 
-        sqlLine.group("psfFlux",         "PSF_INST_FLUX / " + extTimeString)
-        sqlLine.group("psfFluxErr",      "PSF_INST_FLUX_SIG / " + extTimeString)
+        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("psfTheta",        "PSF_THETA")                                               
-        sqlLine.group("psfQf",           "PSF_QF")                                                  
-        sqlLine.group("psfQfPerfect",    "PSF_QF_PERFECT")                                
-        sqlLine.group("psfChiSq",        "PSF_CHISQ")                                     
-        sqlLine.group("psfLikelihood",   "psfLikelihood(EXT_NSIGMA)")                               
-        sqlLine.group("momentXX",        "MOMENTS_XX")                                              
-        sqlLine.group("momentXY",        "MOMENTS_XY")                                              
-        sqlLine.group("momentYY",        "MOMENTS_YY")                                              
-        sqlLine.group("momentR1",        "MOMENTS_R1")                                              
-        sqlLine.group("momentRH",        "MOMENTS_RH")                                              
-#        sqlLine.group("momentM3C",       "MOMENTS_M3C")                                             
-#        sqlLine.group("momentM3S",       "MOMENTS_M3S")                                             
-#        sqlLine.group("momentM4C",       "MOMENTS_M4C")                                             
-#        sqlLine.group("momentM4S",       "MOMENTS_M4S")                                             
+        sqlLine.group("DpsfTheta",        "PSF_THETA")                                               
+        sqlLine.group("DpsfQf",           "PSF_QF")                                                  
+        sqlLine.group("DpsfQfPerfect",    "PSF_QF_PERFECT")                                
+        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")                                             
         if (self.id >= 982483):
-            sqlLine.group("apFlux",          "AP_FLUX / " + extTimeString)
-            sqlLine.group("apFluxErr",       "AP_FLUX_SIG / " + extTimeString)
- #           sqlLine.group("apFillF",         "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
- #       sqlLine.group("apRadius",        "AP_MAG_RADIUS")
-        sqlLine.group("kronFlux",        "KRON_FLUX / " + extTimeString)
-        sqlLine.group("kronFluxErr",     "KRON_FLUX_ERR / " + extTimeString)
-        sqlLine.group("kronRad",         "MOMENTS_R1 * 2.5")
+            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("DkronFlux",        "KRON_FLUX / " + extTimeString)
+        sqlLine.group("DkronFluxErr",     "KRON_FLUX_ERR / " + extTimeString)
+        sqlLine.group("DkronRad",         "MOMENTS_R1 * 2.5")
         sqlLine.group("diffNPos",         "DIFF_NPOS")
         sqlLine.group("diffFRatio",         "DIFF_FRATIO")
@@ -338,8 +336,8 @@
         sqlLine.group("diffPSN",         "DIFF_SN_P")
         sqlLine.group("diffNSN",         "DIFF_SN_M")
-        sqlLine.group("sky",             "SKY  / " + extTimeString)
-        sqlLine.group("skyErr",          "SKY_SIGMA  / " + extTimeString)
-        sqlLine.group("infoFlag",        "FLAGS")                          
-        sqlLine.group("infoFlag2",       "FLAGS2")                          
+        sqlLine.group("Dsky",             "SKY  / " + extTimeString)
+        sqlLine.group("DskyErr",          "SKY_SIGMA  / " + extTimeString)
+        sqlLine.group("DinfoFlag",        "FLAGS")                          
+        sqlLine.group("DinfoFlag2",       "FLAGS2")                          
         sqlLine.group("dataRelease",     str(self.skychunk.dataRelease))                  
 
@@ -494,5 +492,5 @@
                a.airmass      = b.airmass, \
                a.expTime      = b.expTime, \
-               a.infoFlag3    = b.flags  \
+               a.DinfoFlag3    = b.flags  \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)