Index: /trunk/ippToPsps/jython/detectionbatch.py =================================================================== --- /trunk/ippToPsps/jython/detectionbatch.py (revision 38735) +++ /trunk/ippToPsps/jython/detectionbatch.py (revision 38736) @@ -102,5 +102,4 @@ # set up some defauts - self.calibModNum = 0 self.totalNumPhotoRef = 0 @@ -180,5 +179,4 @@ self.scratchDb.updateAllRows("FrameMeta", "surveyID", str(self.surveyID)) self.scratchDb.updateFilterID("FrameMeta", self.filter) - self.scratchDb.updateAllRows("FrameMeta", "calibModNum", str(self.calibModNum)) self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.skychunk.dataRelease)) @@ -299,5 +297,4 @@ self.scratchDb.updateFilterID(tableName, self.filter) - self.scratchDb.updateAllRows(tableName, "calibModNum", str(self.calibModNum)) self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease)) if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO']) Index: /trunk/ippToPsps/jython/diffbatch.py =================================================================== --- /trunk/ippToPsps/jython/diffbatch.py (revision 38735) +++ /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) Index: /trunk/ippToPsps/jython/forcedobjectbatch.py =================================================================== --- /trunk/ippToPsps/jython/forcedobjectbatch.py (revision 38735) +++ /trunk/ippToPsps/jython/forcedobjectbatch.py (revision 38736) @@ -272,5 +272,4 @@ ,ForcedMeanObject." + filter[1] + "FmeanflxR7Std = FLUX_STD_AP_R7 \ ,ForcedMeanObject." + filter[1] + "FmeanflxR7Fill = FLUX_FIL_AP_R7 \ - ,ForcedMeanObject." + filter[1] + "Gamma = GAMMA \ ,ForcedMeanObject." + filter[1] + "E1 = E1 \ ,ForcedMeanObject." + filter[1] + "E2 = E2 " Index: /trunk/ippToPsps/jython/forcedwarpbatch.py =================================================================== --- /trunk/ippToPsps/jython/forcedwarpbatch.py (revision 38735) +++ /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)