Index: trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38602)
+++ trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38736)
@@ -72,5 +72,4 @@
 
 
-       self.calibModNum = 0
        self.totalNumPhotoRef = 0
        self.number={}
@@ -280,5 +279,4 @@
 #        self.scratchDb.updateFilterID("ForcedWarpMeta", self.filterID)
         self.scratchDb.updateFilterID("ForcedWarpMeta_"+forcedWarpID,self.filterName[num][0])
-        self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "calibModNum", str(self.calibModNum))
         self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "dataRelease", str(self.skychunk.dataRelease))
         #self.tablesToExport.append("ForcedWarpMeta")
@@ -352,33 +350,33 @@
         print "here4"
         sqlLine.group("obsTime", str(self.obsTime[num]))
-        sqlLine.group("psfFlux", "PSF_INST_FLUX / "+extTimeString)
-        sqlLine.group("psfFluxErr", "PSF_INST_FLUX_SIG / "+extTimeString)
-        sqlLine.group("psfMajorFWHM",    "PSF_FWHM_MAJ")
-        sqlLine.group("psfMinorFWHM",    "PSF_FWHM_MIN")
-        sqlLine.group("psfTheta",        "PSF_THETA")
-        sqlLine.group("psfCore",         "PSF_CORE")
-        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("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("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("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("dataRelease",str(self.skychunk.dataRelease))
 
@@ -408,5 +406,5 @@
         sqlLine.group("a.telluricExt","b.telluricExt")
         sqlLine.group("a.airmass","b.airmass")
-        sqlLine.group("a.infoFlag3","b.flags")
+        sqlLine.group("a.FinfoFlag3","b.flags")
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))
         try: self.scratchDb.execute(sql)