Changeset 34241 for branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py

Timestamp:

Jul 31, 2012, 11:38:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/ippToPsps

Files:

• . (modified) (1 prop)
• jython/objectbatch.py (modified) (5 diffs)

branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py

@@ -118 +118 @@
                    SET \
                    n" + filter[1] + " = NCODE \
-                   ," + filter[1] + "MeanMag = MAG \
-                   ," + filter[1] + "MeanFlux = 3631 * POW(10.0, (-0.4*MAG)) \
-                   ," + filter[1] + "MeanMagErr = MAG_ERR \
-                   ," + filter[1] + "Min = MAG_20/1000 \
-                   ," + filter[1] + "Max = MAG_80/1000 \
+                   ," + filter[1] + "MeanPSFMag = MAG \
+                   ," + filter[1] + "MeanPSFMagErr = MAG_ERR \
+                   ," + filter[1] + "20pct = MAG_20/1000 \
+                   ," + filter[1] + "80pct = MAG_80/1000 \
                    "
             
@@ -133 +132 @@
 
             sql = "UPDATE Object \
-                   SET " + filter[1] + "MeanMagErr = null \
-                   WHERE " + filter[1] + "MeanMagErr > " + str(cut)
+                   SET " + filter[1] + "MeanPSFMagErr = null \
+                   WHERE " + filter[1] + "MeanPSFMagErr > " + str(cut)
             self.scratchDb.execute(sql)
 
@@ -167 +166 @@
         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 +202 @@
             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")
@@ -211 +210 @@
         self.insertMags(cpsTableName)
 
-        self.updateColors()
+#don't do this as we removed those columns.. 
+#        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)