Changeset 38083

Timestamp:

Apr 2, 2015, 4:23:59 PM (11 years ago)

Author:

heather

Message:

SAS37 final

Location:

trunk/ippToPsps

Files:

• config/settings.xml (modified) (1 diff)
• jython/forcedwarpbatch.py (modified) (1 diff)
• jython/stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/config/settings.xml

@@ -65 +65 @@
       <memory>32</memory>
     </loader>
-    <loader mach="stcsi02">
+    <loader mach="stsci02">
       <name>ipptopsps2_scratch</name>
       <host>stsci02</host>

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -332 +332 @@
             raise
         self.logger.infoPair("need to cull"," nulls objid")
+        rowCountBefore = self.scratchDb.getRowCount("ForcedWarpMeasurement")
         results= self.scratchDb.reportAndDeleteRowsWithNULLS("ForcedWarpMeasurement", "objID")
-
-
-
+        rowCountAfter =  self.scratchDb.getRowCount("ForcedWarpMeasurement")
+        self.logger.infoPair("row count of ForcedWarpMeasurement",rowCountBefore)
+        self.logger.infoPair("row count of ForcedWarpMeasurement after cull of null objID", rowCountAfter)
+        if rowCountAfter == 0:
+            self.skipBatch = True
+            self.logger.infoPair ("skip this batch, it is bad")
+            return False
 #        self.generateRandomIDs()
 

trunk/ippToPsps/jython/stackbatch.py

@@ -526 +526 @@
             return True
 
+        if self.scratchDb.getRowCount(filter+"SkyChip_xfit") <=0 :
+            self.logger.infoPair("no extended source information, trying to skip",filter)
+            return True
+
         header  = self.headerSet[filter]
 
@@ -656 +660 @@
             self.logger.infoPair("no stack data for filter" , filter) 
             return True
+
+        if self.scratchDb.getRowCount(filter+"SkyChip_xsrc") <=0 :
+            self.logger.infoPair("no extended source information, trying to skip",filter)
+            return True
+
 
         header  = self.headerSet[filter]