Changeset 32596 for trunk/ippToPsps

Timestamp:

Oct 28, 2011, 10:24:40 PM (15 years ago)

Author:

rhenders

Message:

some re-arranging so that, if the FITS file is not found in Nebulous, the program does not stop

File:

• trunk/ippToPsps/jython/batch.py (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -54 +54 @@
         self.logger.debug("Batch class constructor")
 
-        # check FITS file is ok
-        if self.fits: 
-            self.header = self.fits.getPrimaryHeader()
-
-            # now check that the fits header is readable
-            if not self.header: return
-
-        # if no fits file, and this is not an IN batch, then get out of here
-        else:
-           if batchType != "IN": return
-
         # set up class variables
         self.id = id
@@ -72 +61 @@
         self.batchType = batchType;
         self.pspsVoTableFilePath = "../config/" + batchType + "/tables.vot"
+
+        # check FITS file is ok
+        if self.fits: 
+            self.header = self.fits.getPrimaryHeader()
+
+            # now check that the fits header is readable
+            if not self.header: 
+                logger.errorPair("Could not read FITS for id", "%d" % id)
+                return
+
+        # if no fits file, and this is not an IN batch, then get out of here
+        else:
+           if batchType != "IN": 
+               logger.errorPair("Could not read FITS for id", "%d" % id)
+               return
 
         # get info from config