Changeset 35496

Timestamp:

May 3, 2013, 8:25:23 AM (13 years ago)

Author:

eugene

Message:

correct some minor errors

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• objectbatch.py (modified) (1 diff)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -65 +65 @@
         self.scratchDb = scratchDb
         self.batchType = batchType;
+        self.skipBatch = False; # set to true if there is a non-fatal error
         self.pspsVoTableFilePath = self.config.configDir + "tables." + batchType + ".vot"
 

trunk/ippToPsps/jython/objectbatch.py

@@ -222 +222 @@
         cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
 
-        self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON_ERR")
-        sql = "UPDATE " + cpsTableName + " set FLUX_KRON_ERR = NULL where FLUX_KRON_ERR < 1e-37 AND FLUX_KRON_ERR > -1e-37 "
+        if False:
+            self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON_ERR")
+            sql = "UPDATE " + cpsTableName + " set FLUX_KRON_ERR = NULL where FLUX_KRON_ERR < 1e-37 AND FLUX_KRON_ERR > -1e-37 "
       
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("Couldn't squash out of range stuff", sql)
-            return False
-
-        self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON")
-        sql = "UPDATE " + cpsTableName + " set FLUX_KRON = NULL where FLUX_KRON < 1e-37 AND FLUX_KRON > -1e-37 "
+            try:
+                self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair("Couldn't squash out of range stuff", sql)
+                return False
+
+            self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON")
+            sql = "UPDATE " + cpsTableName + " set FLUX_KRON = NULL where FLUX_KRON < 1e-37 AND FLUX_KRON > -1e-37 "
       
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("Couldn't squash out of range stuff", sql)
-            return False
-
-
-
+            try:
+                self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair("Couldn't squash out of range stuff", sql)
+                return False
 
         

trunk/ippToPsps/jython/stackbatch.py

@@ -570 +570 @@
   
         ### XXX this should not be a DEEP_STACK only case...
-        if false and self.stackType == "DEEP_STACK": 
+        if False and self.stackType == "DEEP_STACK": 
 
             #if deep stack and instFlux = null and err not null
@@ -953 +953 @@
     def populatePspsTables(self):
 
+        self.skipBatch = False
+
         if not self.useFullTables:
             if not self.getIDsFromDVO():