Changeset 34173 for trunk/ippToPsps

Timestamp:

Jul 17, 2012, 4:30:56 PM (14 years ago)

Author:

heather

Message:

fixes for OB: if outside of ra/dec range, drop it...

Location:

trunk/ippToPsps/jython

Files:

• objectbatch.py (modified) (3 diffs)
• scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/objectbatch.py

@@ -167 +167 @@
         cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
 
-        self.logger.infoPair("Populating", "ObjectCalColor")
+        self.logger.infoPair("Populating", "Object")
         self.logger.infoPair("Inserting objects from", "cpt file")
 
@@ -203 +203 @@
             self.logger.errorPair("Couldn't populate Object table", sql)
             return False
-
+ 
         # add row count columns so we can perform joins to get colors
         self.logger.infoPair("Adding 'row' columns to", "Object and cps tables")
@@ -213 +213 @@
         self.updateColors()
 
+        #objects can have out of range ra dec in dvo - need to find and kill them at the end
+
+        self.logger.infoPair("Determining", "ra/dec range")
+
+        raMin = self.scratchDb.getFromdvoSkyTable("R_MIN",self.region)
+        raMax = self.scratchDb.getFromdvoSkyTable("R_MAX",self.region)
+        decMin = self.scratchDb.getFromdvoSkyTable("D_MIN",self.region)
+        decMax = self.scratchDb.getFromdvoSkyTable("D_MAX",self.region)
+
+        self.logger.infoPair("R_MIN", raMin)
+        self.logger.infoPair("R_MAX", raMax)
+        self.logger.infoPair("D_MIN", decMin)
+        self.logger.infoPair("D_MAX", decMax)
+        #count out of range
+
+        sql = "SELECT count(*) FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin)       
+    
+        rs = self.scratchDb.executeQuery(sql)
+        rs.first()
+        nToDelete = rs.getInt(1)
+        
+        #delete out of range
+        
+ 
+        sql = "DELETE FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin) 
+        self.logger.infoPair("Deleting", str(nToDelete) + " objects outside of ra/dec range")
+
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair("Couldn't cull outsiders from Object table", sql)
+            return False
+
         self.logger.infoPair("Dropping row column from", "Object table")
         self.scratchDb.dropColumn("Object", "row")
         self.logger.infoPair("Purging from scratch Db", self.region + " region")
+
         self.dvoObjects.purgeRegion(self.region)
 

trunk/ippToPsps/jython/scratchdb.py

@@ -591 +591 @@
         return orderedFilters
 
+
+    def getRaDecRangesFromdvoSkyTable(self, name):
+     
+        sql = "SELECT R_MIN, R_MAX, D_MIN, D_MAX FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            raMin = rs.getFloat(1)
+            raMax = rs.getFloat(2)
+            decMin = rs.getFloat(3)
+            decMax = rs.getFloat(4)
+           
+        except:
+            self.logger.errorPair("no ra/decs found for", name)
+            raMin = -999
+            raMax = -999
+            decMin = -999
+            decMax = -999
+
+        return raMin, raMax, decMin, decMax
+ 
+    def getFromdvoSkyTable(self, column, name):
+     
+        sql = "SELECT "+column + " FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            res = rs.getDouble(1)
+                       
+        except:
+            self.logger.errorPair("no ra/decs found for", name)
+            res = -999
+            
+
+        return res