Changeset 37801 for branches/eam_branches/ipp-20140904/ippToPsps/jython/batch.py

Timestamp:

Jan 11, 2015, 1:31:50 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140904/ippToPsps/jython/batch.py (modified) (2 diffs)

branches/eam_branches/ipp-20140904/ippToPsps/jython/batch.py

@@ -382 +382 @@
         self.logger.infoPair("Min objID", "%ld" % self.minObjID)
         self.logger.infoPair("Max objID", "%ld" % self.maxObjID)
+
+
+    '''                                                                                            
+    Sets min and max obj ID using the provided table, or list of tables                            
+    '''
+    def setMinMaxDiffObjID(self, tables):
+        first = True
+        self.totalDetections = 0
+        for table in tables:
+            sql = "SELECT MIN(diffObjID), MAX(diffObjID), COUNT(diffObjID) FROM " + table
+            rs = self.scratchDb.executeQuery(sql)
+            rs.first()
+            self.totalDetections = self.totalDetections + rs.getLong(3)
+            if first:
+                self.minObjID = rs.getLong(1)
+                self.maxObjID = rs.getLong(2)
+            else:
+                if rs.getLong(1) < self.minObjID: self.minObjID = rs.getLong(1)
+                if rs.getLong(2) > self.maxObjID: self.maxObjID = rs.getLong(2)
+            first = False
+            rs.close()
+        self.ippToPspsDb.updateDetectionStats(self.batchID, self.minObjID, self.maxObjID, self.totalDetections)
+        self.logger.infoPair("Total detections", "%ld" % self.totalDetections)
+        self.logger.infoPair("Min objID", "%ld" % self.minObjID)
+        self.logger.infoPair("Max objID", "%ld" % self.maxObjID)
+
+
 
     '''
@@ -579 +606 @@
         # for OB, this imports object data from DVO
         if not self.importIppTables():
-            if self.batchType == "OB":
+            if (self.batchType == "OB" or self.batchType =="DO" or self.batchType =="FO"):
                 self.logger.errorPair("skipping this batch", "no dvo tables for this region")
                 self.ippToPspsDb.updateProcessed(self.batchID, 1)