IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39031


Ignore:
Timestamp:
Nov 2, 2015, 6:35:49 PM (11 years ago)
Author:
watersc1
Message:

Correct sexagesimal objName calculation. Add decimal version into objAltName1, and create AltName2/3 columns that can be filled in the future. Tested through test suite.

Location:
trunk/ippToPsps
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/tables.DO.vot

    r38944 r39031  
    88      <FIELD name="diffObjName" arraysize="100" datatype="char" unit="dimensionless" default="NA">
    99        <DESCRIPTION>IAU name for this object.</DESCRIPTION>
     10      </FIELD>
     11      <FIELD name="diffObjAltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">
     12        <DESCRIPTION>Alternate Pan-STARRs name for this object.</DESCRIPTION>
     13      </FIELD>
     14      <FIELD name="diffObjAltName2" arraysize="100" datatype="char" unit="dimensionless" default="">
     15        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
     16      </FIELD>
     17      <FIELD name="diffObjAltName3" arraysize="100" datatype="char" unit="dimensionless" default="">
     18        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
    1019      </FIELD>
    1120      <FIELD name="diffObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • trunk/ippToPsps/config/tables.OB.vot

    r38944 r39031  
    88      <FIELD name="objName" arraysize="32" datatype="char" unit="dimensionless"  default="NA">
    99        <DESCRIPTION>IAU name for this object.</DESCRIPTION>
     10      </FIELD>
     11      <FIELD name="objAltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">
     12        <DESCRIPTION>Alternate Pan-STARRs name for this object.</DESCRIPTION>
     13      </FIELD>
     14      <FIELD name="objAltName2" arraysize="100" datatype="char" unit="dimensionless" default="">
     15        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
     16      </FIELD>
     17      <FIELD name="objAltName3" arraysize="100" datatype="char" unit="dimensionless" default="">
     18        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
    1019      </FIELD>
    1120      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • trunk/ippToPsps/jython/diffobjectbatch.py

    r38944 r39031  
    215215        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    216216        lpad(floor(ra/15.),2,'0'), \
    217         lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \
    218         lpad(format(((ra/15.-(floor(ra/15.)))*60.-floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),4,'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'), \
    219219        '+', \
    220         lpad(floor(dec_),2,'0'), \
    221         lpad((dec_-(floor(dec_)))*60. ,2,'0'), \
    222         lpad(format(((dec_-(floor(dec_)))*60.-floor((dec_-(floor(dec_)))*60.))*60.,2),4,'0') \
     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') \
    223223        ) where ra > -999 and dec_ > -999 and dec_ >= 0"
     224
    224225        try:
    225226            self.scratchDb.execute(sql)
    … …  
    232233        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    233234        lpad(floor(ra/15.),2,'0'), \
    234         lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \
    235         lpad(format(((ra/15.-(floor(ra/15.)))*60.-floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),4,'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'), \
    236237        '-', \
    237         lpad(floor(dec_),2,'0'), \
    238         lpad((dec_-(floor(dec_)))*60. ,2,'0'), \
    239         lpad(format(((dec_-(floor(dec_)))*60.-floor((dec_-(floor(dec_)))*60.))*60.,2),4,'0') \
     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') \
    240241        ) where ra > -999 and dec_ > -999 and dec_ < 0"
    241242
    … …  
    245246            self.logger.errorPair("failed sql", sql)
    246247            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
    247272
    248273    '''

  • trunk/ippToPsps/jython/objectbatch.py

    r38944 r39031  
    248248    ##this is a 4 part update:
    249249        self.logger.infoPair("updating objName", "using stacks")
     250
    250251    ## if we have a stackra and dec, use stackra and dec , dec >=0
    251252
    252253        sql = "update ObjectThin set objName =  concat('PSO J', \
    253254        lpad(floor(raStack/15.),2,'0'), \
    254         lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \
    255         lpad(format(((raStack/15.-(floor(raStack/15.)))*60.-floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),4,'0'), \
     255        lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
     256        lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
    256257        '+', \
    257         lpad(floor(decStack),2,'0'), \
    258         lpad((decStack-(floor(decStack)))*60. ,2,'0'), \
    259         lpad(format(((decStack-(floor(decStack)))*60.-floor((decStack-(floor(decStack)))*60.))*60.,2),4,'0') \
     258        lpad(floor(abs(decStack)),2,'0'), \
     259        lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
     260        lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
    260261        ) where raStack > -999 and decStack > -999 and decStack >= 0"
    261262        try:
    … …  
    265266            raise
    266267            return False
    267 
    268268
    269269    ## if we have a stackra and dec, use stackra and dec, dec < 0
    … …  
    271271        sql = "update ObjectThin set objName =  concat('PSO J', \
    272272        lpad(floor(raStack/15.),2,'0'), \
    273         lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \
    274         lpad(format(((raStack/15.-(floor(raStack/15.)))*60.-floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),4,'0'), \
     273        lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
     274        lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
    275275        '-', \
    276         lpad(floor(decStack),2,'0'), \
    277         lpad((decStack-(floor(decStack)))*60. ,2,'0'), \
    278         lpad(format(((decStack-(floor(decStack)))*60.-floor((decStack-(floor(decStack)))*60.))*60.,2),4,'0') \
    279         ) where raStack > -999 and decStack > -999 and decStack <= 0"
    280         try:
    281             self.scratchDb.execute(sql)
    282         except:
    283             self.logger.errorPair("failed sql", sql)
    284             raise
    285             return False
     276        lpad(floor(abs(decStack)),2,'0'), \
     277        lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
     278        lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
     279        ) where raStack > -999 and decStack > -999 and decStack < 0"
     280        try:
     281            self.scratchDb.execute(sql)
     282        except:
     283            self.logger.errorPair("failed sql", sql)
     284            raise
     285            return False
     286
    286287        self.logger.infoPair("updating objName", "using means")
     288
     289
    287290    ## use mean ra and dec (dec >= 0)
    288291        sql = "update ObjectThin set objName =  concat('PSO J', \
    289292        lpad(floor(raMean/15.),2,'0'), \
    290         lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \
    291         lpad(format(((raMean/15.-(floor(raMean/15.)))*60.-floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),4,'0'), \
     293        lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
     294        lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
    292295        '+', \
    293         lpad(floor(decMean),2,'0'), \
    294         lpad((decMean-(floor(decMean)))*60. ,2,'0'), \
    295         lpad(format(((decMean-(floor(decMean)))*60.-floor((decMean-(floor(decMean)))*60.))*60.,2),4,'0') \
    296         ) where raMean > -999 and decMean > -999 and decMean >= 0"
     296        lpad(floor(abs(decMean)),2,'0'), \
     297        lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
     298        lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
     299        ) where raMean > -999 and decMean > -999 and decMean >= 0 AND objName IS NULL"
     300
    297301        try:
    298302            self.scratchDb.execute(sql)
    … …  
    306310        sql = "update ObjectThin set objName =  concat('PSO J', \
    307311        lpad(floor(raMean/15.),2,'0'), \
    308         lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \
    309         lpad(format(((raMean/15.-(floor(raMean/15.)))*60.-floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),4,'0'), \
     312        lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
     313        lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
    310314        '-', \
    311         lpad(floor(decMean),2,'0'), \
    312         lpad((decMean-(floor(decMean)))*60. ,2,'0'), \
    313         lpad(format(((decMean-(floor(decMean)))*60.-floor((decMean-(floor(decMean)))*60.))*60.,2),4,'0') \
    314         ) where raMean > -999 and decMean > -999 and decMean < 0"
    315 
    316         try:
    317             self.scratchDb.execute(sql)
    318         except:
    319             self.logger.errorPair("failed sql", sql)
    320             raise
    321             return False
     315        lpad(floor(abs(decMean)),2,'0'), \
     316        lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
     317        lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
     318        ) where raMean > -999 and decMean > -999 and decMean < 0 AND objName IS NULL"
     319        try:
     320            self.scratchDb.execute(sql)
     321        except:
     322            self.logger.errorPair("failed sql", sql)
     323            raise
     324            return False
     325
     326
     327        # update altname
     328        self.logger.infoPair("updating objAltName1", "using stacks")
     329       
     330        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
     331        format(raStack,4),'+',format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack >= 0 "
     332        try:
     333            self.scratchDb.execute(sql)
     334        except:
     335            self.logger.errorPair("failed sql", sql)
     336            raise
     337            return False
     338
     339        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
     340        format(raStack,4),format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack < 0 "
     341        try:
     342            self.scratchDb.execute(sql)
     343        except:
     344            self.logger.errorPair("failed sql", sql)
     345            raise
     346            return False
     347
     348        self.logger.infoPair("updating objAltName1", "using means")
     349       
     350        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
     351        format(raMean,4),'+',format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean >= 0 AND objAltName1 IS NULL"
     352        try:
     353            self.scratchDb.execute(sql)
     354        except:
     355            self.logger.errorPair("failed sql", sql)
     356            raise
     357            return False
     358
     359        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
     360        format(raMean,4),format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean < 0 AND objAltName1 IS NULL"
     361        try:
     362            self.scratchDb.execute(sql)
     363        except:
     364            self.logger.errorPair("failed sql", sql)
     365            raise
     366            return False
     367
     368       
     369
    322370
    323371    '''
Note: See TracChangeset for help on using the changeset viewer.