Index: trunk/ippToPsps/jython/detectionbatch.py
===================================================================
--- trunk/ippToPsps/jython/detectionbatch.py	(revision 38775)
+++ trunk/ippToPsps/jython/detectionbatch.py	(revision 38780)
@@ -417,58 +417,58 @@
         # below, we convert instrumental fluxes to Jy
 
-        sqlLine.group("ippDetectID",     "IPP_IDET")                                                
-#       sqlLine.group("randomDetID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
-        sqlLine.group("randomDetID",     "RAND("+str(self.batchID)+")")                       
-        sqlLine.group("filterID",        str(self.filterID))                                        
-        sqlLine.group("surveyID",        str(self.surveyID))                                        
-        sqlLine.group("obsTime",         str(self.obsTime))                                         
-        sqlLine.group("xPos",            "X_PSF")                                                   
-        sqlLine.group("yPos",            "Y_PSF")                                                   
-        sqlLine.group("xPosErr",         "X_PSF_SIG")                                               
-        sqlLine.group("yPosErr",         "Y_PSF_SIG")                                               
+        sqlLine.group("ippDetectID",      "IPP_IDET")                                                
+#       sqlLine.group("randomDetID",      "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
+        sqlLine.group("randomDetID",      "RAND("+str(self.batchID)+")")                       
+        sqlLine.group("filterID",         str(self.filterID))                                        
+        sqlLine.group("surveyID",         str(self.surveyID))                                        
+        sqlLine.group("obsTime",          str(self.obsTime))                                         
+        sqlLine.group("xPos",             "X_PSF")                                                   
+        sqlLine.group("yPos",             "Y_PSF")                                                   
+        sqlLine.group("xPosErr",          "X_PSF_SIG")                                               
+        sqlLine.group("yPosErr",          "Y_PSF_SIG")                                               
         if (self.id >= 982483):
-            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("pltScale",     "PLTSCALE")                                      
+            sqlLine.group("posAngle",     "POSANGLE")                                      
+            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("extNSigma","EXT_NSIGMA")    
-        sqlLine.group("psfFlux",         "PSF_INST_FLUX / " + extTimeString)
-        sqlLine.group("psfFluxErr",      "PSF_INST_FLUX_SIG / " + extTimeString)
+            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("extNSigma",        "EXT_NSIGMA")    
+        sqlLine.group("psfFlux",          "PSF_INST_FLUX / " + extTimeString)
+        sqlLine.group("psfFluxErr",       "PSF_INST_FLUX_SIG / " + extTimeString)
         if (self.id >= 982483):
-            sqlLine.group("psfMajorFWHM",    "PSF_FWHM_MAJ * abs(PLTSCALE)")                                               
-            sqlLine.group("psfMinorFWHM",    "PSF_FWHM_MIN * abs(PLTSCALE)")                                               
-            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 * PLTSCALE * PLTSCALE")                                              
-        sqlLine.group("momentXY",        "MOMENTS_XY * PLTSCALE * PLTSCALE")                                              
-        sqlLine.group("momentYY",        "MOMENTS_YY * PLTSCALE * PLTSCALE")                                              
-        sqlLine.group("momentR1",        "MOMENTS_R1 * abs(PLTSCALE)")                                              
-        sqlLine.group("momentRH",        "MOMENTS_RH * abs(PLTSCALE)")                                              
-        sqlLine.group("momentM3C",       "MOMENTS_M3C * PLTSCALE * PLTSCALE")                                             
-        sqlLine.group("momentM3S",       "MOMENTS_M3S * PLTSCALE * PLTSCALE")                                             
-        sqlLine.group("momentM4C",       "MOMENTS_M4C * PLTSCALE * PLTSCALE")                                             
-        sqlLine.group("momentM4S",       "MOMENTS_M4S * PLTSCALE * PLTSCALE")                                             
+            sqlLine.group("psfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)")                                               
+            sqlLine.group("psfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)")                                               
+            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 * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("momentXY",         "MOMENTS_XY * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("momentYY",         "MOMENTS_YY * PLTSCALE * PLTSCALE")                                              
+        sqlLine.group("momentR1",         "MOMENTS_R1 * abs(PLTSCALE)")                                              
+        sqlLine.group("momentRH",         "MOMENTS_RH * abs(PLTSCALE)")                                              
+        sqlLine.group("momentM3C",        "MOMENTS_M3C * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("momentM3S",        "MOMENTS_M3S * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("momentM4C",        "MOMENTS_M4C * PLTSCALE * PLTSCALE")                                             
+        sqlLine.group("momentM4S",        "MOMENTS_M4S * PLTSCALE * PLTSCALE") 
         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("sky",             "SKY  / " + extTimeString)
-        sqlLine.group("skyErr",          "SKY_SIGMA  / " + extTimeString)
-        sqlLine.group("infoFlag",        "FLAGS")                          
-        sqlLine.group("infoFlag2",       "FLAGS2")                          
-        sqlLine.group("processingVersion",     str(self.skychunk.processingVersion))                  
+            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 * abs(PLTSCALE)")
+        sqlLine.group("sky",              "SKY / PLTSCALE / PLTSCALE / " + extTimeString)
+        sqlLine.group("skyErr",           "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString)
+        sqlLine.group("infoFlag",         "FLAGS")                          
+        sqlLine.group("infoFlag2",        "FLAGS2")                          
+        sqlLine.group("processingVersion", str(self.skychunk.processingVersion))                  
 
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
@@ -685,4 +685,5 @@
         self.logger.info("Updating table '" + table + "' with DVO IDs using imageID = %d" % imageID)
 
+        # XXX : EAM 20150925 : is this IGNORE necessary?
         sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
                a.objID        = b.objID, \
@@ -703,4 +704,6 @@
                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)