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

Timestamp:

Dec 11, 2015, 5:03:38 PM (11 years ago)

Author:

watersc1

Message:

Add popular and alternate names, and receive IAU and PSO names from dvopsps call.

File:

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

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -210 +210 @@
     def updateDiffObjName(self):
     ##this is a 2 part update:
-
-        self.logger.infoPair("updating diffObjName", "using means")
-    ## use mean ra and dec (dec >= 0)
-        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
-        lpad(floor(ra/15.),2,'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(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)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
- 
-    ## use mean ra and dec (dec < 0)
-
-        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
-        lpad(floor(ra/15.),2,'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(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)
-        except:
-            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
-
+        self.logger.info("Names are now populated with the populateDiffObjectTable call")
+
+        return True
 
     '''
@@ -322 +265 @@
         sqlLine.group("ra",                "RA_MEAN")
         sqlLine.group("dec_",              "DEC_MEAN")
+        sqlLine.group("diffObjName",       "IAU_NAME")
+        sqlLine.group("diffObjPSOName",    "PSO_NAME")
         sqlLine.group("nDetections",       "'0'")
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)