Changeset 38780
- Timestamp:
- Oct 5, 2015, 5:01:40 PM (11 years ago)
- File:
-
- 1 edited
-
trunk/ippToPsps/jython/detectionbatch.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/jython/detectionbatch.py
r38775 r38780 417 417 # below, we convert instrumental fluxes to Jy 418 418 419 sqlLine.group("ippDetectID", "IPP_IDET")420 # sqlLine.group("randomDetID", "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")421 sqlLine.group("randomDetID", "RAND("+str(self.batchID)+")")422 sqlLine.group("filterID", str(self.filterID))423 sqlLine.group("surveyID", str(self.surveyID))424 sqlLine.group("obsTime", str(self.obsTime))425 sqlLine.group("xPos", "X_PSF")426 sqlLine.group("yPos", "Y_PSF")427 sqlLine.group("xPosErr", "X_PSF_SIG")428 sqlLine.group("yPosErr", "Y_PSF_SIG")419 sqlLine.group("ippDetectID", "IPP_IDET") 420 # sqlLine.group("randomDetID", "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") 421 sqlLine.group("randomDetID", "RAND("+str(self.batchID)+")") 422 sqlLine.group("filterID", str(self.filterID)) 423 sqlLine.group("surveyID", str(self.surveyID)) 424 sqlLine.group("obsTime", str(self.obsTime)) 425 sqlLine.group("xPos", "X_PSF") 426 sqlLine.group("yPos", "Y_PSF") 427 sqlLine.group("xPosErr", "X_PSF_SIG") 428 sqlLine.group("yPosErr", "Y_PSF_SIG") 429 429 if (self.id >= 982483): 430 sqlLine.group("pltScale", 431 sqlLine.group("posAngle", 432 sqlLine.group("raErr", 433 sqlLine.group("decErr", 430 sqlLine.group("pltScale", "PLTSCALE") 431 sqlLine.group("posAngle", "POSANGLE") 432 sqlLine.group("raErr", "X_PSF_SIG * abs(PLTSCALE)") 433 sqlLine.group("decErr", "Y_PSF_SIG * abs(PLTSCALE)") 434 434 else: 435 sqlLine.group("pltScale", 436 sqlLine.group("posAngle", 437 sqlLine.group("raErr", 438 sqlLine.group("decErr", 439 sqlLine.group("extNSigma", "EXT_NSIGMA")440 sqlLine.group("psfFlux", "PSF_INST_FLUX / " + extTimeString)441 sqlLine.group("psfFluxErr", "PSF_INST_FLUX_SIG / " + extTimeString)435 sqlLine.group("pltScale", "0.257") 436 sqlLine.group("posAngle", "-999") 437 sqlLine.group("raErr", "X_PSF_SIG * 0.257") 438 sqlLine.group("decErr", "Y_PSF_SIG * 0.257") 439 sqlLine.group("extNSigma", "EXT_NSIGMA") 440 sqlLine.group("psfFlux", "PSF_INST_FLUX / " + extTimeString) 441 sqlLine.group("psfFluxErr", "PSF_INST_FLUX_SIG / " + extTimeString) 442 442 if (self.id >= 982483): 443 sqlLine.group("psfMajorFWHM", 444 sqlLine.group("psfMinorFWHM", 445 sqlLine.group("psfCore", 446 sqlLine.group("psfTheta", "PSF_THETA")447 sqlLine.group("psfQf", "PSF_QF")448 sqlLine.group("psfQfPerfect", "PSF_QF_PERFECT")449 sqlLine.group("psfChiSq", "PSF_CHISQ")450 sqlLine.group("psfLikelihood", "psfLikelihood(EXT_NSIGMA)")451 sqlLine.group("momentXX", "MOMENTS_XX * PLTSCALE * PLTSCALE")452 sqlLine.group("momentXY", "MOMENTS_XY * PLTSCALE * PLTSCALE")453 sqlLine.group("momentYY", "MOMENTS_YY * PLTSCALE * PLTSCALE")454 sqlLine.group("momentR1", "MOMENTS_R1 * abs(PLTSCALE)")455 sqlLine.group("momentRH", "MOMENTS_RH * abs(PLTSCALE)")456 sqlLine.group("momentM3C", "MOMENTS_M3C * PLTSCALE * PLTSCALE")457 sqlLine.group("momentM3S", "MOMENTS_M3S * PLTSCALE * PLTSCALE")458 sqlLine.group("momentM4C", "MOMENTS_M4C * PLTSCALE * PLTSCALE")459 sqlLine.group("momentM4S", "MOMENTS_M4S * PLTSCALE * PLTSCALE")443 sqlLine.group("psfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") 444 sqlLine.group("psfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") 445 sqlLine.group("psfCore", "PSF_CORE") 446 sqlLine.group("psfTheta", "PSF_THETA") 447 sqlLine.group("psfQf", "PSF_QF") 448 sqlLine.group("psfQfPerfect", "PSF_QF_PERFECT") 449 sqlLine.group("psfChiSq", "PSF_CHISQ") 450 sqlLine.group("psfLikelihood", "psfLikelihood(EXT_NSIGMA)") 451 sqlLine.group("momentXX", "MOMENTS_XX * PLTSCALE * PLTSCALE") 452 sqlLine.group("momentXY", "MOMENTS_XY * PLTSCALE * PLTSCALE") 453 sqlLine.group("momentYY", "MOMENTS_YY * PLTSCALE * PLTSCALE") 454 sqlLine.group("momentR1", "MOMENTS_R1 * abs(PLTSCALE)") 455 sqlLine.group("momentRH", "MOMENTS_RH * abs(PLTSCALE)") 456 sqlLine.group("momentM3C", "MOMENTS_M3C * PLTSCALE * PLTSCALE") 457 sqlLine.group("momentM3S", "MOMENTS_M3S * PLTSCALE * PLTSCALE") 458 sqlLine.group("momentM4C", "MOMENTS_M4C * PLTSCALE * PLTSCALE") 459 sqlLine.group("momentM4S", "MOMENTS_M4S * PLTSCALE * PLTSCALE") 460 460 if (self.id >= 982483): 461 sqlLine.group("apFlux", 462 sqlLine.group("apFluxErr", 463 sqlLine.group("apFillF", 464 sqlLine.group("apRadius", "AP_MAG_RADIUS")465 sqlLine.group("kronFlux", "KRON_FLUX / " + extTimeString)466 sqlLine.group("kronFluxErr", "KRON_FLUX_ERR / " + extTimeString)467 sqlLine.group("kronRad", "MOMENTS_R1 * 2.5")468 sqlLine.group("sky", "SKY/ " + extTimeString)469 sqlLine.group("skyErr", "SKY_SIGMA/ " + extTimeString)470 sqlLine.group("infoFlag", "FLAGS")471 sqlLine.group("infoFlag2", "FLAGS2")472 sqlLine.group("processingVersion", 461 sqlLine.group("apFlux", "AP_FLUX / " + extTimeString) 462 sqlLine.group("apFluxErr", "AP_FLUX_SIG / " + extTimeString) 463 sqlLine.group("apFillF", "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))") 464 sqlLine.group("apRadius", "AP_MAG_RADIUS") 465 sqlLine.group("kronFlux", "KRON_FLUX / " + extTimeString) 466 sqlLine.group("kronFluxErr", "KRON_FLUX_ERR / " + extTimeString) 467 sqlLine.group("kronRad", "MOMENTS_R1 * 2.5 * abs(PLTSCALE)") 468 sqlLine.group("sky", "SKY / PLTSCALE / PLTSCALE / " + extTimeString) 469 sqlLine.group("skyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + extTimeString) 470 sqlLine.group("infoFlag", "FLAGS") 471 sqlLine.group("infoFlag2", "FLAGS2") 472 sqlLine.group("processingVersion", str(self.skychunk.processingVersion)) 473 473 474 474 sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName) … … 685 685 self.logger.info("Updating table '" + table + "' with DVO IDs using imageID = %d" % imageID) 686 686 687 # XXX : EAM 20150925 : is this IGNORE necessary? 687 688 sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \ 688 689 a.objID = b.objID, \ … … 703 704 a.kronFlux = a.kronFlux * b.zpFactor, \ 704 705 a.kronFluxErr = a.kronFluxErr * b.zpFactor \ 706 a.sky = a.sky * b.zpFactor, \ 707 a.skyErr = a.skyErr * b.zpFactor, \ 705 708 WHERE a.ippDetectID = b.ippDetectID \ 706 709 AND b.imageID = " + str(imageID)
Note:
See TracChangeset
for help on using the changeset viewer.
