Changeset 36720

Timestamp:

May 1, 2014, 5:20:08 PM (12 years ago)

Author:

heather

Message:

working on batch.py

File:

• trunk/ippToPsps/jython/batch.py (modified) (1 diff)

trunk/ippToPsps/jython/batch.py

@@ -551 +551 @@
         # for P2/ST, this reads the detection tables from the CMF/SMF file(s)
         # for OB, this imports object data from DVO
-        if not self.importIppTables():
-            if self.batchType == "OB":
-                self.logger.errorPair("skipping this batch", "no dvo tables for this region")
-                self.ippToPspsDb.updateProcessed(self.batchID, 1)
-                return True
-
-            self.logger.errorPair("Aborting this batch", "could not import IPP tables")
-            self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            raise
+        if self.batchType != "ST":
+            # if not ST we do it 
+            if not self.importIppTables():
+                if self.batchType == "OB":
+                    self.logger.errorPair("skipping this batch", "no dvo tables for this region")
+                    self.ippToPspsDb.updateProcessed(self.batchID, 1)
+                    return True
+                self.logger.errorPair("Aborting this batch", "could not import IPP tables")
+                self.ippToPspsDb.updateProcessed(self.batchID, -1)
+                raise
 
         if not self.populatePspsTables():