Index: trunk/ippToPsps/jython/objectbatch.py
===================================================================
--- trunk/ippToPsps/jython/objectbatch.py	(revision 39099)
+++ trunk/ippToPsps/jython/objectbatch.py	(revision 39255)
@@ -247,127 +247,7 @@
     '''
     def updateObjName(self):
-    ##this is a 4 part update:
-        self.logger.infoPair("updating objName", "using stacks")
-
-    ## if we have a stackra and dec, use stackra and dec , dec >=0
-
-        sql = "update ObjectThin set objName =  concat('PSO J', \
-        lpad(floor(raStack/15.),2,'0'), \
-        lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
-        lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
-        '+', \
-        lpad(floor(abs(decStack)),2,'0'), \
-        lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
-        lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
-        ) where raStack > -999 and decStack > -999 and decStack >= 0"
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-    ## if we have a stackra and dec, use stackra and dec, dec < 0
-
-        sql = "update ObjectThin set objName =  concat('PSO J', \
-        lpad(floor(raStack/15.),2,'0'), \
-        lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
-        lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
-        '-', \
-        lpad(floor(abs(decStack)),2,'0'), \
-        lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
-        lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
-        ) where raStack > -999 and decStack > -999 and decStack < 0"
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-        self.logger.infoPair("updating objName", "using means")
-
-
-    ## use mean ra and dec (dec >= 0)
-        sql = "update ObjectThin set objName =  concat('PSO J', \
-        lpad(floor(raMean/15.),2,'0'), \
-        lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
-        lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
-        '+', \
-        lpad(floor(abs(decMean)),2,'0'), \
-        lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
-        lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
-        ) where raMean > -999 and decMean > -999 and decMean >= 0 AND objName IS NULL"
-
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
- 
-    ## use mean ra and dec (dec < 0)
-
-        sql = "update ObjectThin set objName =  concat('PSO J', \
-        lpad(floor(raMean/15.),2,'0'), \
-        lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
-        lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
-        '-', \
-        lpad(floor(abs(decMean)),2,'0'), \
-        lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
-        lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
-        ) where raMean > -999 and decMean > -999 and decMean < 0 AND objName IS NULL"
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-
-        # update altname
-        self.logger.infoPair("updating objAltName1", "using stacks")
-        
-        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
-        format(raStack,4),'+',format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack >= 0 "
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
-        format(raStack,4),format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack < 0 "
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-        self.logger.infoPair("updating objAltName1", "using means")
-        
-        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
-        format(raMean,4),'+',format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean >= 0 AND objAltName1 IS NULL"
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-        sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
-        format(raMean,4),format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean < 0 AND objAltName1 IS NULL"
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("failed sql", sql)
-            raise
-            return False
-
-        
-
-
+        self.logger.info("Names are now populated with the populateObjectThinTable call")
+
+        return True
     '''
     Populates the Object table
@@ -428,4 +308,6 @@
         sqlLine.group("raMean",          "RA_MEAN")
         sqlLine.group("decMean",         "DEC_MEAN")
+        sqlLine.group("objName",         "IAU_NAME")
+        sqlLine.group("objPSOName",      "PSO_NAME")
         sqlLine.group("epochMean",       "EPOCH_MEAN")
         sqlLine.group("raMeanErr",       "RA_ERR")