Changeset 38783
- Timestamp:
- Oct 5, 2015, 5:46:18 PM (11 years ago)
- File:
-
- 1 edited
-
trunk/ippToPsps/jython/diffbatch.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/jython/diffbatch.py
r38763 r38783 276 276 sqlLine.group("diffDetMetaID", str(diffSkyFileID)); 277 277 278 # sqlLine.group("randomDiffID", "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")279 278 sqlLine.group("randomDiffID", "RAND("+str(self.batchID)+")") 280 279 sqlLine.group("filterID", str(self.filterID[num])) 281 280 sqlLine.group("surveyID", str(self.surveyID)) 282 281 sqlLine.group("skycellID", str(self.skycellID[num])) 283 ## sqlLine.group("obsTime", str(self.obsTime))284 282 sqlLine.group("expTime", str(self.expTime[num])) 285 sqlLine.group("obsTime", str(self.obsTime[num]))283 sqlLine.group("obsTime", str(self.obsTime[num])) 286 284 sqlLine.group("xPos", "X_PSF") 287 285 sqlLine.group("yPos", "Y_PSF") … … 291 289 sqlLine.group("pltScale", "PLTSCALE") 292 290 sqlLine.group("posAngle", "POSANGLE") 293 #sqlLine.group("raErr", "X_PSF_SIG * abs(PLTSCALE)")294 #sqlLine.group("decErr", "Y_PSF_SIG * abs(PLTSCALE)")291 sqlLine.group("raErr", "X_PSF_SIG * abs(PLTSCALE)") 292 sqlLine.group("decErr", "Y_PSF_SIG * abs(PLTSCALE)") 295 293 else: 296 294 sqlLine.group("pltScale", "0.257") 297 295 sqlLine.group("posAngle", "-999") 298 #sqlLine.group("raErr", "X_PSF_SIG * 0.257")299 #sqlLine.group("decErr", "Y_PSF_SIG * 0.257")296 sqlLine.group("raErr", "X_PSF_SIG * 0.257") 297 sqlLine.group("decErr", "Y_PSF_SIG * 0.257") 300 298 sqlLine.group("DpsfFlux", "PSF_INST_FLUX / " + extTimeString) 301 299 sqlLine.group("DpsfFluxErr", "PSF_INST_FLUX_SIG / " + extTimeString) 302 # if (self.id >= 982483): #we don't have PSF_FWHM_MAJ or MIN or PSF_CORE 303 # sqlLine.group("psfMajorFWHM", "PSF_FWHM_MAJ") 304 # sqlLine.group("psfMinorFWHM", "PSF_FWHM_MIN") 305 # sqlLine.group("psfCore", "PSF_CORE") 300 sqlLine.group("DpsfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") 301 sqlLine.group("DpsfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") 302 sqlLine.group("DpsfCore", "PSF_CORE") 306 303 sqlLine.group("DpsfTheta", "PSF_THETA") 307 304 sqlLine.group("DpsfQf", "PSF_QF") … … 309 306 sqlLine.group("DpsfChiSq", "PSF_CHISQ") 310 307 sqlLine.group("DpsfLikelihood", "psfLikelihood(EXT_NSIGMA)") 311 sqlLine.group("DmomentXX", "MOMENTS_XX ")312 sqlLine.group("DmomentXY", "MOMENTS_XY ")313 sqlLine.group("DmomentYY", "MOMENTS_YY ")314 sqlLine.group("DmomentR1", "MOMENTS_R1 ")315 sqlLine.group("DmomentRH", "MOMENTS_RH ")316 # sqlLine.group("DmomentM3C", "MOMENTS_M3C")317 # sqlLine.group("DmomentM3S", "MOMENTS_M3S")318 # sqlLine.group("DmomentM4C", "MOMENTS_M4C")319 # sqlLine.group("DmomentM4S", "MOMENTS_M4S")308 sqlLine.group("DmomentXX", "MOMENTS_XX * PLTSCALE * PLTSCALE") 309 sqlLine.group("DmomentXY", "MOMENTS_XY * PLTSCALE * PLTSCALE") 310 sqlLine.group("DmomentYY", "MOMENTS_YY * PLTSCALE * PLTSCALE") 311 sqlLine.group("DmomentR1", "MOMENTS_R1 * abs(PLTSCALE)") 312 sqlLine.group("DmomentRH", "MOMENTS_RH * sqrt(abs(PLTSCALE))") 313 sqlLine.group("DmomentM3C", "MOMENTS_M3C * PLTSCALE * PLTSCALE") 314 sqlLine.group("DmomentM3S", "MOMENTS_M3S * PLTSCALE * PLTSCALE") 315 sqlLine.group("DmomentM4C", "MOMENTS_M4C * PLTSCALE * PLTSCALE") 316 sqlLine.group("DmomentM4S", "MOMENTS_M4S * PLTSCALE * PLTSCALE") 320 317 if (self.id >= 982483): 321 318 sqlLine.group("DapFlux", "AP_FLUX / " + extTimeString) 322 319 sqlLine.group("DapFluxErr", "AP_FLUX_SIG / " + extTimeString) 323 324 320 # sqlLine.group("DapFillF", "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))") 321 # sqlLine.group("DapRadius", "AP_MAG_RADIUS") 325 322 sqlLine.group("DkronFlux", "KRON_FLUX / " + extTimeString) 326 323 sqlLine.group("DkronFluxErr", "KRON_FLUX_ERR / " + extTimeString) 327 sqlLine.group("DkronRad", "MOMENTS_R1 * 2.5 ")324 sqlLine.group("DkronRad", "MOMENTS_R1 * 2.5 * abs(PLTSCALE)") 328 325 sqlLine.group("diffNPos", "DIFF_NPOS") 329 sqlLine.group("diffFRatio", 326 sqlLine.group("diffFRatio", "DIFF_FRATIO") 330 327 sqlLine.group("diffNBad", "DIFF_NRATIO_BAD") 331 sqlLine.group("diffNMask", 328 sqlLine.group("diffNMask", "DIFF_NRATIO_MASK") 332 329 sqlLine.group("diffNAll", "DIFF_NRATIO_ALL") 333 sqlLine.group("diffPdist", 334 sqlLine.group("diffNdist", 335 sqlLine.group("diffPSN", "DIFF_SN_P")336 sqlLine.group("diffNSN", "DIFF_SN_M")337 sqlLine.group("Dsky", "SKY / " + extTimeString)338 sqlLine.group("DskyErr", "SKY_SIGMA / " + extTimeString)330 sqlLine.group("diffPdist", "DIFF_R_P") 331 sqlLine.group("diffNdist", "DIFF_R_M") 332 sqlLine.group("diffPSN", "DIFF_SN_P") 333 sqlLine.group("diffNSN", "DIFF_SN_M") 334 sqlLine.group("Dsky", "SKY / PLTSCALE / PLTSCALE / " + extTimeString) 335 sqlLine.group("DskyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString) 339 336 sqlLine.group("DinfoFlag", "FLAGS") 340 337 sqlLine.group("DinfoFlag2", "FLAGS2") … … 491 488 a.airmass = b.airmass, \ 492 489 a.expTime = b.expTime, \ 493 a.DinfoFlag3 = b.flags \ 490 a.DinfoFlag3 = b.flags \ 491 a.psfFlux = a.psfFlux * b.zpFactor, \ 492 a.psfFluxErr = a.psfFluxErr * b.zpFactor, \ 493 a.apFlux = a.apFlux * b.zpFactor, \ 494 a.apFluxErr = a.apFluxErr * b.zpFactor, \ 495 a.kronFlux = a.kronFlux * b.zpFactor, \ 496 a.kronFluxErr = a.kronFluxErr * b.zpFactor \ 497 a.sky = a.sky * b.zpFactor, \ 498 a.skyErr = a.skyErr * b.zpFactor \ 494 499 WHERE a.ippDetectID = b.ippDetectID \ 495 500 AND b.imageID = " + str(imageID)
Note:
See TracChangeset
for help on using the changeset viewer.
