- Timestamp:
- Dec 11, 2015, 5:03:38 PM (11 years ago)
- Location:
- trunk/ippToPsps
- Files:
-
- 4 edited
-
config/tables.DO.vot (modified) (1 diff)
-
config/tables.OB.vot (modified) (1 diff)
-
jython/diffobjectbatch.py (modified) (2 diffs)
-
jython/objectbatch.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/config/tables.DO.vot
r39032 r39255 6 6 <DESCRIPTION>Contains the positional information for difference detection objects in a number of coordinate systems. The objects associate difference detections within a one arcsecond radius. The number of detections in each filter from is listed, along with maximum coverage fractions. References: Szalay, A. S., Gray, J., Fekete, G., et al. 2007, arXiv:cs/0701164.</DESCRIPTION> 7 7 <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM> 8 <FIELD name="diffObjName" arraysize=" 100" datatype="char" unit="dimensionless" default="NA">8 <FIELD name="diffObjName" arraysize="32" datatype="char" unit="dimensionless" default="NA"> 9 9 <DESCRIPTION>IAU name for this object.</DESCRIPTION> 10 10 </FIELD> 11 <FIELD name="diffObj AltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">11 <FIELD name="diffObjPSOName" arraysize="32" datatype="char" unit="dimensionless" default="NA"> 12 12 <DESCRIPTION>Alternate Pan-STARRS name for this object.</DESCRIPTION> 13 13 </FIELD> 14 <FIELD name="diffObjAltName 2" arraysize="100" datatype="char" unit="dimensionless" default="">14 <FIELD name="diffObjAltName1" arraysize="32" datatype="char" unit="dimensionless" default=""> 15 15 <DESCRIPTION>Altername name for this object.</DESCRIPTION> 16 16 </FIELD> 17 <FIELD name="diffObjAltName 3" arraysize="100" datatype="char" unit="dimensionless" default="">17 <FIELD name="diffObjAltName2" arraysize="32" datatype="char" unit="dimensionless" default=""> 18 18 <DESCRIPTION>Altername name for this object.</DESCRIPTION> 19 </FIELD> 20 <FIELD name="diffObjAltName3" arraysize="32" datatype="char" unit="dimensionless" default=""> 21 <DESCRIPTION>Altername name for this object.</DESCRIPTION> 22 </FIELD> 23 <FIELD name="diffObjPopularName" arraysize="140" datatype="char" unit="dimensionless" default=""> 24 <DESCRIPTION>Well known name for this object.</DESCRIPTION> 19 25 </FIELD> 20 26 <FIELD name="diffObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA"> -
trunk/ippToPsps/config/tables.OB.vot
r39088 r39255 11 11 <DESCRIPTION>IAU name for this object.</DESCRIPTION> 12 12 </FIELD> 13 <FIELD name="obj AltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">13 <FIELD name="objPSOName" arraysize="32" datatype="char" unit="dimensionless" default="NA"> 14 14 <DESCRIPTION>Alternate Pan-STARRS name for this object.</DESCRIPTION> 15 15 </FIELD> 16 <FIELD name="objAltName2" arraysize="100" datatype="char" unit="dimensionless" default=""> 16 <FIELD name="objAltName1" arraysize="32" datatype="char" unit="dimensionless" default="NA"> 17 <DESCRIPTION>Alternate name for this object.</DESCRIPTION> 18 </FIELD> 19 <FIELD name="objAltName2" arraysize="32" datatype="char" unit="dimensionless" default=""> 17 20 <DESCRIPTION>Altername name for this object.</DESCRIPTION> 18 21 </FIELD> 19 <FIELD name="objAltName3" arraysize=" 100" datatype="char" unit="dimensionless" default="">22 <FIELD name="objAltName3" arraysize="32" datatype="char" unit="dimensionless" default=""> 20 23 <DESCRIPTION>Altername name for this object.</DESCRIPTION> 24 </FIELD> 25 <FIELD name="objPopularName" arraysize="140" datatype="char" unit="dimensionless" default=""> 26 <DESCRIPTION>Well known name for this object.</DESCRIPTION> 21 27 </FIELD> 22 28 <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA"> -
trunk/ippToPsps/jython/diffobjectbatch.py
r39075 r39255 210 210 def updateDiffObjName(self): 211 211 ##this is a 2 part update: 212 213 self.logger.infoPair("updating diffObjName", "using means") 214 ## use mean ra and dec (dec >= 0) 215 sql = "update DiffDetObject set diffObjName = concat('PSO J', \ 216 lpad(floor(ra/15.),2,'0'), \ 217 lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \ 218 lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \ 219 '+', \ 220 lpad(floor(abs(dec_)),2,'0'), \ 221 lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \ 222 lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \ 223 ) where ra > -999 and dec_ > -999 and dec_ >= 0" 224 225 try: 226 self.scratchDb.execute(sql) 227 except: 228 self.logger.errorPair("failed sql", sql) 229 raise 230 231 ## use mean ra and dec (dec < 0) 232 233 sql = "update DiffDetObject set diffObjName = concat('PSO J', \ 234 lpad(floor(ra/15.),2,'0'), \ 235 lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \ 236 lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \ 237 '-', \ 238 lpad(floor(abs(dec_)),2,'0'), \ 239 lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \ 240 lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \ 241 ) where ra > -999 and dec_ > -999 and dec_ < 0" 242 243 try: 244 self.scratchDb.execute(sql) 245 except: 246 self.logger.errorPair("failed sql", sql) 247 raise 248 249 ## Update altName with decimal form 250 self.logger.infoPair("updating diffObjAltName1", "using means") 251 252 sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \ 253 format(ra,4),'+',format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ >= 0 " 254 255 try: 256 self.scratchDb.execute(sql) 257 except: 258 self.logger.errorPair("failed sql", sql) 259 raise 260 return False 261 262 sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \ 263 format(ra,4),format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ < 0" 264 265 try: 266 self.scratchDb.execute(sql) 267 except: 268 self.logger.errorPair("failed sql", sql) 269 raise 270 return False 271 212 self.logger.info("Names are now populated with the populateDiffObjectTable call") 213 214 return True 272 215 273 216 ''' … … 322 265 sqlLine.group("ra", "RA_MEAN") 323 266 sqlLine.group("dec_", "DEC_MEAN") 267 sqlLine.group("diffObjName", "IAU_NAME") 268 sqlLine.group("diffObjPSOName", "PSO_NAME") 324 269 sqlLine.group("nDetections", "'0'") 325 270 sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName) -
trunk/ippToPsps/jython/objectbatch.py
r39099 r39255 247 247 ''' 248 248 def updateObjName(self): 249 ##this is a 4 part update: 250 self.logger.infoPair("updating objName", "using stacks") 251 252 ## if we have a stackra and dec, use stackra and dec , dec >=0 253 254 sql = "update ObjectThin set objName = concat('PSO J', \ 255 lpad(floor(raStack/15.),2,'0'), \ 256 lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \ 257 lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \ 258 '+', \ 259 lpad(floor(abs(decStack)),2,'0'), \ 260 lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \ 261 lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \ 262 ) where raStack > -999 and decStack > -999 and decStack >= 0" 263 try: 264 self.scratchDb.execute(sql) 265 except: 266 self.logger.errorPair("failed sql", sql) 267 raise 268 return False 269 270 ## if we have a stackra and dec, use stackra and dec, dec < 0 271 272 sql = "update ObjectThin set objName = concat('PSO J', \ 273 lpad(floor(raStack/15.),2,'0'), \ 274 lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \ 275 lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \ 276 '-', \ 277 lpad(floor(abs(decStack)),2,'0'), \ 278 lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \ 279 lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \ 280 ) where raStack > -999 and decStack > -999 and decStack < 0" 281 try: 282 self.scratchDb.execute(sql) 283 except: 284 self.logger.errorPair("failed sql", sql) 285 raise 286 return False 287 288 self.logger.infoPair("updating objName", "using means") 289 290 291 ## use mean ra and dec (dec >= 0) 292 sql = "update ObjectThin set objName = concat('PSO J', \ 293 lpad(floor(raMean/15.),2,'0'), \ 294 lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \ 295 lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \ 296 '+', \ 297 lpad(floor(abs(decMean)),2,'0'), \ 298 lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \ 299 lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \ 300 ) where raMean > -999 and decMean > -999 and decMean >= 0 AND objName IS NULL" 301 302 try: 303 self.scratchDb.execute(sql) 304 except: 305 self.logger.errorPair("failed sql", sql) 306 raise 307 return False 308 309 ## use mean ra and dec (dec < 0) 310 311 sql = "update ObjectThin set objName = concat('PSO J', \ 312 lpad(floor(raMean/15.),2,'0'), \ 313 lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \ 314 lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \ 315 '-', \ 316 lpad(floor(abs(decMean)),2,'0'), \ 317 lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \ 318 lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \ 319 ) where raMean > -999 and decMean > -999 and decMean < 0 AND objName IS NULL" 320 try: 321 self.scratchDb.execute(sql) 322 except: 323 self.logger.errorPair("failed sql", sql) 324 raise 325 return False 326 327 328 # update altname 329 self.logger.infoPair("updating objAltName1", "using stacks") 330 331 sql = "update ObjectThin SET objAltName1 = concat('PSO J', \ 332 format(raStack,4),'+',format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack >= 0 " 333 try: 334 self.scratchDb.execute(sql) 335 except: 336 self.logger.errorPair("failed sql", sql) 337 raise 338 return False 339 340 sql = "update ObjectThin SET objAltName1 = concat('PSO J', \ 341 format(raStack,4),format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack < 0 " 342 try: 343 self.scratchDb.execute(sql) 344 except: 345 self.logger.errorPair("failed sql", sql) 346 raise 347 return False 348 349 self.logger.infoPair("updating objAltName1", "using means") 350 351 sql = "update ObjectThin SET objAltName1 = concat('PSO J', \ 352 format(raMean,4),'+',format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean >= 0 AND objAltName1 IS NULL" 353 try: 354 self.scratchDb.execute(sql) 355 except: 356 self.logger.errorPair("failed sql", sql) 357 raise 358 return False 359 360 sql = "update ObjectThin SET objAltName1 = concat('PSO J', \ 361 format(raMean,4),format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean < 0 AND objAltName1 IS NULL" 362 try: 363 self.scratchDb.execute(sql) 364 except: 365 self.logger.errorPair("failed sql", sql) 366 raise 367 return False 368 369 370 371 249 self.logger.info("Names are now populated with the populateObjectThinTable call") 250 251 return True 372 252 ''' 373 253 Populates the Object table … … 428 308 sqlLine.group("raMean", "RA_MEAN") 429 309 sqlLine.group("decMean", "DEC_MEAN") 310 sqlLine.group("objName", "IAU_NAME") 311 sqlLine.group("objPSOName", "PSO_NAME") 430 312 sqlLine.group("epochMean", "EPOCH_MEAN") 431 313 sqlLine.group("raMeanErr", "RA_ERR")
Note:
See TracChangeset
for help on using the changeset viewer.
