Changeset 39039 for trunk/ippToPsps/jython/diffbatch.py
- Timestamp:
- Nov 3, 2015, 10:43:02 PM (11 years ago)
- File:
-
- 1 edited
-
trunk/ippToPsps/jython/diffbatch.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/jython/diffbatch.py
r39016 r39039 103 103 meta = {} 104 104 meta = self.gpc1Db.getDiffStageMeta(int(diffSkyFileID)) 105 self.logger.infoPair("ok, I guess that worked","now doing this")106 105 107 106 # this code is very fragile: it depends on the right order in the output … … 110 109 self.logger.errorPair("Could not get", "diff metadata") 111 110 raise 112 self.logger.infoPair("so meta", "much amaze")113 111 self.filterName[num] = meta[0]; 114 112 … … 291 289 292 290 sqlLine.group("ippDetectID", "IPP_IDET") 293 sqlLine.group("diffImageID", str(diffSkyFileID)) ;294 295 sqlLine.group("randomDiffID", "RAND("+str(self.batchID)+")") 296 sqlLine.group("filterID", str(self.filterID[num])) 297 sqlLine.group("surveyID", str(self.surveyID)) 291 sqlLine.group("diffImageID", str(diffSkyFileID)) 292 293 sqlLine.group("randomDiffID", "RAND("+str(self.batchID)+")") 294 sqlLine.group("filterID", str(self.filterID[num])) 295 sqlLine.group("surveyID", str(self.surveyID)) 298 296 sqlLine.group("skycellID", str(self.skycellID[num])) 299 297 sqlLine.group("expTime", str(self.expTime[num])) 300 298 sqlLine.group("obsTime", str(self.obsTime[num])) 301 sqlLine.group("xPos", "X_PSF") 302 sqlLine.group("yPos", "Y_PSF") 303 sqlLine.group("xPosErr", "X_PSF_SIG") 304 sqlLine.group("yPosErr", "Y_PSF_SIG") 299 sqlLine.group("xPos", "X_PSF") 300 sqlLine.group("yPos", "Y_PSF") 301 sqlLine.group("xPosErr", "X_PSF_SIG") 302 sqlLine.group("yPosErr", "Y_PSF_SIG") 305 303 if (self.id >= 982483): 306 sqlLine.group("pltScale", "PLTSCALE") 307 sqlLine.group("posAngle", "POSANGLE") 308 sqlLine.group("raErr", "X_PSF_SIG * abs(PLTSCALE)") 309 sqlLine.group("decErr", "Y_PSF_SIG * abs(PLTSCALE)") 304 sqlLine.group("pltScale", "PLTSCALE") 305 sqlLine.group("posAngle", "POSANGLE") 306 sqlLine.group("raErr", "X_PSF_SIG * abs(PLTSCALE)") 307 sqlLine.group("decErr", "Y_PSF_SIG * abs(PLTSCALE)") 310 308 else: 311 sqlLine.group("pltScale", "0.257") 312 sqlLine.group("posAngle", "-999") 313 sqlLine.group("raErr", "X_PSF_SIG * 0.25 7")314 sqlLine.group("decErr", "Y_PSF_SIG * 0.25 7")309 sqlLine.group("pltScale", "0.257") 310 sqlLine.group("posAngle", "-999") 311 sqlLine.group("raErr", "X_PSF_SIG * 0.25") 312 sqlLine.group("decErr", "Y_PSF_SIG * 0.25") 315 313 sqlLine.group("DpsfFlux", "PSF_INST_FLUX / " + expTimeString) 316 314 sqlLine.group("DpsfFluxErr", "PSF_INST_FLUX_SIG / " + expTimeString) 317 sqlLine.group("DpsfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") 318 sqlLine.group("DpsfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") 319 sqlLine.group("DpsfCore", "PSF_CORE") 320 sqlLine.group("DpsfTheta", "PSF_THETA") 321 sqlLine.group("DpsfQf", "PSF_QF") 322 sqlLine.group("DpsfQfPerfect", "PSF_QF_PERFECT") 323 sqlLine.group("DpsfChiSq", "PSF_CHISQ") 324 sqlLine.group("DpsfLikelihood", "psfLikelihood(EXT_NSIGMA)") 325 sqlLine.group("DmomentXX", "MOMENTS_XX * PLTSCALE * PLTSCALE") 326 sqlLine.group("DmomentXY", "MOMENTS_XY * PLTSCALE * PLTSCALE") 327 sqlLine.group("DmomentYY", "MOMENTS_YY * PLTSCALE * PLTSCALE") 328 sqlLine.group("DmomentR1", "MOMENTS_R1 * abs(PLTSCALE)") 329 sqlLine.group("DmomentRH", "MOMENTS_RH * sqrt(abs(PLTSCALE))") 315 316 if self.havePsfFwhm[num]: 317 print "I have PSF_FWHM_MAJ, setting a value" 318 sqlLine.group("DpsfMajorFWHM", "PSF_FWHM_MAJ * abs(PLTSCALE)") 319 sqlLine.group("DpsfMinorFWHM", "PSF_FWHM_MIN * abs(PLTSCALE)") 320 sqlLine.group("DpsfCore", "PSF_CORE") 321 322 if self.haveSrcPos[num]: 323 print "I have SRC_CHIP_X, setting a value" 324 sqlLine.group("xPosChip", "SRC_CHIP_X") 325 sqlLine.group("yPosChip", "SRC_CHIP_Y") 326 sqlLine.group("ccdID" , "SRC_CHIP_NUM") 327 328 sqlLine.group("DpsfTheta", "PSF_THETA") 329 sqlLine.group("DpsfQf", "PSF_QF") 330 sqlLine.group("DpsfQfPerfect", "PSF_QF_PERFECT") 331 sqlLine.group("DpsfChiSq", "PSF_CHISQ") 332 sqlLine.group("DpsfLikelihood", "psfLikelihood(EXT_NSIGMA)") 333 sqlLine.group("DmomentXX", "MOMENTS_XX * PLTSCALE * PLTSCALE") 334 sqlLine.group("DmomentXY", "MOMENTS_XY * PLTSCALE * PLTSCALE") 335 sqlLine.group("DmomentYY", "MOMENTS_YY * PLTSCALE * PLTSCALE") 336 sqlLine.group("DmomentR1", "MOMENTS_R1 * abs(PLTSCALE)") 337 sqlLine.group("DmomentRH", "MOMENTS_RH * sqrt(abs(PLTSCALE))") 330 338 if (self.id >= 982483): 331 339 sqlLine.group("DapFlux", "AP_FLUX / " + expTimeString) … … 348 356 sqlLine.group("Dsky", "SKY / PLTSCALE / PLTSCALE / " + expTimeString) 349 357 sqlLine.group("DskyErr", "SKY_SIGMA / PLTSCALE / PLTSCALE / " + expTimeString) 350 sqlLine.group("DinfoFlag", "FLAGS") 351 sqlLine.group("DinfoFlag2", "FLAGS2") 358 sqlLine.group("DinfoFlag", "FLAGS") 359 sqlLine.group("DinfoFlag2", "FLAGS2") 352 360 sqlLine.group("processingVersion", str(self.skychunk.processingVersion)) 353 361 … … 672 680 self.tablesLoaded = [] 673 681 self.haveApNpix = {} 682 self.havePsfFwhm = {} 683 self.haveSrcPos = {} 674 684 675 685 for num in self.number: … … 698 708 # this is an optional field, check for it in the table below 699 709 self.haveApNpix[num] = 0 710 self.havePsfFwhm[num] = 0 711 self.haveSrcPos[num] = 0 700 712 701 713 for table in tables: … … 705 717 if 'AP_NPIX' in columns: 706 718 self.haveApNpix[num] = 1 719 if 'PSF_FWHM_MAJ' in columns: 720 self.havePsfFwhm[num] = 1 721 if 'SRC_CHIP_X' in columns: 722 self.haveSrcPos[num] = 1 707 723 708 724
Note:
See TracChangeset
for help on using the changeset viewer.
