Changeset 39031 for trunk/ippToPsps/jython/diffobjectbatch.py

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.

File:

• trunk/ippToPsps/jython/diffobjectbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -215 +215 @@
         sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
         lpad(floor(ra/15.),2,'0'), \
-        lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \
-        lpad(format(((ra/15.-(floor(ra/15.)))*60.-floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),4,'0'), \
+        lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
+        lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
         '+', \
-        lpad(floor(dec_),2,'0'), \
-        lpad((dec_-(floor(dec_)))*60. ,2,'0'), \
-        lpad(format(((dec_-(floor(dec_)))*60.-floor((dec_-(floor(dec_)))*60.))*60.,2),4,'0') \
+        lpad(floor(abs(dec_)),2,'0'), \
+        lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
+        lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
         ) where ra > -999 and dec_ > -999 and dec_ >= 0"
+
         try:
             self.scratchDb.execute(sql)
@@ -232 +233 @@
         sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
         lpad(floor(ra/15.),2,'0'), \
-        lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \
-        lpad(format(((ra/15.-(floor(ra/15.)))*60.-floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),4,'0'), \
+        lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
+        lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
         '-', \
-        lpad(floor(dec_),2,'0'), \
-        lpad((dec_-(floor(dec_)))*60. ,2,'0'), \
-        lpad(format(((dec_-(floor(dec_)))*60.-floor((dec_-(floor(dec_)))*60.))*60.,2),4,'0') \
+        lpad(floor(abs(dec_)),2,'0'), \
+        lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
+        lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
         ) where ra > -999 and dec_ > -999 and dec_ < 0"
 
@@ -245 +246 @@
             self.logger.errorPair("failed sql", sql)
             raise
+
+        ## Update altName with decimal form
+        self.logger.infoPair("updating diffObjAltName1", "using means")
+        
+        sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
+        format(ra,4),'+',format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ >= 0 "
+
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair("failed sql", sql)
+            raise
+            return False
+
+        sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
+        format(ra,4),format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ < 0"
+
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair("failed sql", sql)
+            raise
+            return False
+
 
     '''