Index: trunk/ippToPsps/jython/detectionbatch.py =================================================================== --- trunk/ippToPsps/jython/detectionbatch.py (revision 38801) +++ trunk/ippToPsps/jython/detectionbatch.py (revision 38802) @@ -410,5 +410,5 @@ results['SATDET'] = 0 - extTimeString = str(self.header['EXPTIME']) + expTimeString = str(self.header['EXPTIME']) # insert all detections into table : do NOT include the IGNORE unless we have to @@ -444,6 +444,6 @@ 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("psfFlux", "PSF_INST_FLUX / " + expTimeString) + sqlLine.group("psfFluxErr", "PSF_INST_FLUX_SIG / " + expTimeString) if (self.id >= 982483): sqlLine.group("psfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") @@ -465,13 +465,13 @@ 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("apFlux", "AP_FLUX / " + expTimeString) + sqlLine.group("apFluxErr", "AP_FLUX_SIG / " + expTimeString) sqlLine.group("apFillF", "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))") sqlLine.group("apRadius", "AP_MAG_RADIUS * abs(PLTSCALE)") - sqlLine.group("kronFlux", "KRON_FLUX / " + extTimeString) - sqlLine.group("kronFluxErr", "KRON_FLUX_ERR / " + extTimeString) + sqlLine.group("kronFlux", "KRON_FLUX / " + expTimeString) + sqlLine.group("kronFluxErr", "KRON_FLUX_ERR / " + expTimeString) 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("sky", "SKY / PLTSCALE / PLTSCALE / " + expTimeString) + sqlLine.group("skyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + expTimeString) sqlLine.group("infoFlag", "FLAGS") sqlLine.group("infoFlag2", "FLAGS2") Index: trunk/ippToPsps/jython/diffbatch.py =================================================================== --- trunk/ippToPsps/jython/diffbatch.py (revision 38801) +++ trunk/ippToPsps/jython/diffbatch.py (revision 38802) @@ -264,5 +264,5 @@ #results['SATDET'] = 0 - extTimeString = str(self.expTime[num]) + expTimeString = str(self.expTime[num]) # insert all detections into table : do NOT include the IGNORE unless we have to @@ -296,6 +296,6 @@ 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) + sqlLine.group("DpsfFlux", "PSF_INST_FLUX / " + expTimeString) + sqlLine.group("DpsfFluxErr", "PSF_INST_FLUX_SIG / " + expTimeString) sqlLine.group("DpsfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") sqlLine.group("DpsfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") @@ -316,10 +316,10 @@ 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("DapFlux", "AP_FLUX / " + expTimeString) + sqlLine.group("DapFluxErr", "AP_FLUX_SIG / " + expTimeString) # 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("DkronFlux", "KRON_FLUX / " + expTimeString) + sqlLine.group("DkronFluxErr", "KRON_FLUX_ERR / " + expTimeString) sqlLine.group("DkronRad", "MOMENTS_R1 * 2.5 * abs(PLTSCALE)") sqlLine.group("diffNPos", "DIFF_NPOS") @@ -332,6 +332,6 @@ 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("Dsky", "SKY / PLTSCALE / PLTSCALE / " + expTimeString) + sqlLine.group("DskyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + expTimeString) sqlLine.group("DinfoFlag", "FLAGS") sqlLine.group("DinfoFlag2", "FLAGS2") Index: trunk/ippToPsps/jython/forcedwarpbatch.py =================================================================== --- trunk/ippToPsps/jython/forcedwarpbatch.py (revision 38801) +++ trunk/ippToPsps/jython/forcedwarpbatch.py (revision 38802) @@ -332,5 +332,5 @@ BEFORE = self.scratchDb.getRowCount(ippTableName) - extTimeString = str(self.expTime[num]) + expTimeString = str(self.expTime[num]) #missing are zp, telluricExt, airmass (not easy to get ?) @@ -353,6 +353,6 @@ print "here4" sqlLine.group("obsTime", str(self.obsTime[num])) - sqlLine.group("FpsfFlux", "PSF_INST_FLUX / " + extTimeString) - sqlLine.group("FpsfFluxErr", "PSF_INST_FLUX_SIG / " + extTimeString) + sqlLine.group("FpsfFlux", "PSF_INST_FLUX / " + expTimeString) + sqlLine.group("FpsfFluxErr", "PSF_INST_FLUX_SIG / " + expTimeString) sqlLine.group("FpsfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") sqlLine.group("FpsfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") @@ -372,13 +372,13 @@ sqlLine.group("FmomentM4C", "MOMENTS_M4C * PLTSCALE * PLTSCALE") sqlLine.group("FmomentM4S", "MOMENTS_M4S * PLTSCALE * PLTSCALE") - sqlLine.group("FapFlux", "AP_FLUX / " + extTimeString) - sqlLine.group("FapFluxErr", "AP_FLUX_SIG / " + extTimeString) + sqlLine.group("FapFlux", "AP_FLUX / " + expTimeString) + sqlLine.group("FapFluxErr", "AP_FLUX_SIG / " + expTimeString) sqlLine.group("FapFillF", "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))") sqlLine.group("FapRadius", "AP_MAG_RADIUS") - sqlLine.group("FkronFlux", "KRON_FLUX / " + extTimeString) - sqlLine.group("FkronFluxErr", "KRON_FLUX_ERR / " + extTimeString ) + sqlLine.group("FkronFlux", "KRON_FLUX / " + expTimeString) + sqlLine.group("FkronFluxErr", "KRON_FLUX_ERR / " + expTimeString ) sqlLine.group("FkronRad", "MOMENTS_R1 * 2.5 * abs(PLTSCALE)") - sqlLine.group("Fsky", "SKY / PLTSCALE / PLTSCALE / " + extTimeString) - sqlLine.group("FskyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString) + sqlLine.group("Fsky", "SKY / PLTSCALE / PLTSCALE / " + expTimeString) + sqlLine.group("FskyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + expTimeString) sqlLine.group("FinfoFlag", "FLAGS") sqlLine.group("FinfoFlag2", "FLAGS2") Index: trunk/ippToPsps/jython/stackbatch.py =================================================================== --- trunk/ippToPsps/jython/stackbatch.py (revision 38801) +++ trunk/ippToPsps/jython/stackbatch.py (revision 38802) @@ -361,8 +361,4 @@ raise - # insert values coming from the CMF, not carried by DVO - header = self.headerSet[filter] - exptime = self.getKeyFloat(header, "%.5f", "EXPTIME") - sqlLine = sqlUtility("UPDATE StackObjectThin AS a , " + filter + "SkyChip_psf AS b SET") @@ -424,4 +420,5 @@ header = self.headerSet[filter] exptime = self.getKeyFloat(header, "%.5f", "EXPTIME") + expTimeString = str(exptime) # insert all the detections @@ -447,10 +444,10 @@ sqlLine.group("a."+filter+"momentR1", "b.MOMENTS_R1 * b.PLTSCALE") sqlLine.group("a."+filter+"momentRH", "b.MOMENTS_RH * b.PLTSCALE") - sqlLine.group("a."+filter+"PSFFlux", "b.PSF_INST_FLUX / " + str(exptime)) - sqlLine.group("a."+filter+"PSFFluxErr", "b.PSF_INST_FLUX_SIG / " + str(exptime)) - sqlLine.group("a."+filter+"ApFlux", "b.AP_FLUX / " + str(exptime)) - sqlLine.group("a."+filter+"ApFluxErr", "b.AP_FLUX_SIG / " + str(exptime)) - sqlLine.group("a."+filter+"KronFlux", "b.KRON_FLUX / " + str(exptime)) - sqlLine.group("a."+filter+"KronFluxErr", "b.KRON_FLUX_ERR / " + str(exptime)) + sqlLine.group("a."+filter+"PSFFlux", "b.PSF_INST_FLUX / " + expTimeString) + sqlLine.group("a."+filter+"PSFFluxErr", "b.PSF_INST_FLUX_SIG / " + expTimeString) + sqlLine.group("a."+filter+"ApFlux", "b.AP_FLUX / " + expTimeString) + sqlLine.group("a."+filter+"ApFluxErr", "b.AP_FLUX_SIG / " + expTimeString) + sqlLine.group("a."+filter+"KronFlux", "b.KRON_FLUX / " + expTimeString) + sqlLine.group("a."+filter+"KronFluxErr", "b.KRON_FLUX_ERR / " + expTimeString) sqlLine.group("a."+filter+"ApFillFac", "b.AP_NPIX / (3.14159265359 * POW(b.AP_MAG_RADIUS - 0.5, 2))") sqlLine.group("a."+filter+"ApRadius", "b.AP_MAG_RADIUS") @@ -458,6 +455,6 @@ sqlLine.group("a."+filter+"PlateScale", "b.PLTSCALE") sqlLine.group("a."+filter+"ExtNSigma", "b.EXT_NSIGMA") - sqlLine.group("a."+filter+"sky", "b.SKY / " + str(exptime)) - sqlLine.group("a."+filter+"skyErr", "b.SKY_SIGMA / " + str(exptime)) + sqlLine.group("a."+filter+"sky", "b.SKY / " + expTimeString) + sqlLine.group("a."+filter+"skyErr", "b.SKY_SIGMA / " + expTimeString) sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET") @@ -531,16 +528,14 @@ continue - header = self.headerSet[filter] - exptime = self.getKeyFloat(header, "%.5f", "EXPTIME") - # insert all the detections sqlLine = sqlUtility("UPDATE " + tablename + " AS a , " + filter + "SkyChip_xsrc AS b SET") - sqlLine.group("a."+filter+"haveData", "'1'") - sqlLine.group("a."+filter+"S2", "b.G_S2") + sqlLine.group("a."+filter+"haveData", "'1'") + sqlLine.group("a."+filter+"S2", "b.G_S2") sqlLine.group("a."+filter+"logRT", "b.G_RT") sqlLine.group("a."+filter+"logRA", "b.G_RA") sqlLine.group("a."+filter+"bumpy", "b.G_BUMPY") - sqlLine.group("a."+filter+"halfLightRad", "b.HALF_LIGHT_RADIUS") + sqlLine.group("a."+filter+"halfLightRad", "b.HALF_LIGHT_RADIUS") + sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET") @@ -781,7 +776,8 @@ # PETRO_MAG is instrumental + 2.5log(exptime) + FPA.ZP # we want to apply the DVO zero point, so remove FPA.ZP: + ## XXX is this statement true: is FPA.ZP + 2.5log(exptime) applied to PETRO_MAG? hdrZP = "%.5f" % float(header['FPA.ZP']) - # magtime = "%.5f" % (2.5*math.log10(float(header['EXPTIME']))) + magtime = "%.5f" % (2.5*math.log10(float(header['EXPTIME']))) self.logger.infoPair("Adding", "petrosians for extended sources")