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

Timestamp:

Feb 23, 2015, 4:08:25 PM (11 years ago)

Author:

heather

Message:

sas37 fo now works!

File:

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

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -14 +14 @@
 from ipptopspsdb import IppToPspsDb
 from scratchdb import ScratchDb
-from dvoobjects import DvoObjects
+#from dvoobjects import DvoObjects
+from dvodiffobjects import DvoDiffObjects
 from sqlUtility import sqlUtility
 
@@ -53 +54 @@
 
        try:
-           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+           self.dvoDiffObjects = DvoDiffObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
        except:
-           self.logger.errorPair("Unable to create instance of", "DvoObjects")
+           self.logger.errorPair("Unable to create instance of", "DvoDiffObjects")
            raise
 
@@ -72 +73 @@
         self.region = self.scratchDb.getRegionNameFromThisDvoIndex(self.id)
         self.ippToPspsDb.insertObjectMeta(self.batchID, self.region)
-        self.dvoObjects.nativeIngestRegion(self.region)
+        self.dvoDiffObjects.nativeIngestRegion(self.region)
 
         cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")
@@ -184 +185 @@
             except:
                 self.logger.errorPair("failed sql", sql)
+                raise
                 return False
 
 
         # XXX this does not seem like a good thing to leave in SQL
-        self.logger.infoPair("Calculating nDetections from", "n[filters]")
-        for filter in filters:
+        #self.logger.infoPair("Calculating nDetections from", "n[filters]")
+        #for filter in filters:
             # now do a sum of n[filters], but do not include the ones with -999
-            sql  = "UPDATE DiffDetObject "
-            sql += "SET nDetections = nDetections + " + filter[1] +"nTotal "
-            sql += " WHERE " + filter[1] + "nTotal != -999"
-            try:
-                self.scratchDb.execute(sql)
-            except:
-                self.logger.errorPair("failed sql", sql)
-                return False
+         #   sql  = "UPDATE DiffDetObject "
+         #   sql += "SET nDetections = nDetections + n" + filter[1]
+         #   sql += " WHERE n" + filter[1] + " != -999"
+         #   try:
+         #       self.scratchDb.execute(sql)
+         #   except:
+         #       self.logger.errorPair("failed sql", sql)
+         #       raise
+                
 
 
@@ -223 +226 @@
         except:
             self.logger.errorPair("failed sql", sql)
-            return False
+            raise
  
     ## use mean ra and dec (dec < 0)
@@ -241 +244 @@
         except:
             self.logger.errorPair("failed sql", sql)
-            return False
+            raise
 
     '''
@@ -261 +264 @@
             except:
                 self.logger.errorPair("Couldn't squash out of range stuff", sql)
-                return False
+                raise
 
             self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON")
@@ -270 +273 @@
             except:
                 self.logger.errorPair("Couldn't squash out of range stuff", sql)
-                return False
+                raise
 
         
@@ -288 +291 @@
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
         sqlLine.group("dvoRegionID",     "CAT_ID") 
-        sqlLine.group("skycellID",       "SKYCELL_ID") 
+#        sqlLine.group("skycellID",       "SKYCELL_ID") 
         sqlLine.group("dataRelease",     "'" + str(self.skychunk.dataRelease) + "'")
         sqlLine.group("objInfoFlag",     "FLAGS") 
@@ -304 +307 @@
         except:
             self.logger.errorPair("Couldn't populate DiffDetObject table", sql)
-            return False
+            raise
  
         # add row count columns so we can perform joins to get colors
@@ -317 +320 @@
 
         self.logger.infoPair("update DiffDetObject from ","cps table")
-
+        #this fills ng/etc
         self.updateDiffObjectFromCps(cpsTableName)
-
+        #this fills qfperfect
+        self.updateMeanObjectFromCps(cpsTableName)
         # XXX EAM 20140724 : is this necessary??
         #objects can have out of range ra dec in dvo - need to find and kill them at the end
@@ -360 +364 @@
         except:
             self.logger.errorPair("Couldn't cull outsiders from DiffDetObject table", sql)
-            return False
+            raise
 
         self.logger.infoPair("Dropping row column from", "DiffDetObject table")
@@ -385 +389 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
 
@@ -425 +429 @@
         self.scratchDb.dropColumn("DiffDetObject", "row")
 
-        self.dvoObjects.purgeRegion(self.region)
+        self.dvoDiffObjects.purgeRegion(self.region)
 
         #this is abuse of something but this is how I get the object batches to crash to further investigate them