Changeset 32211

Timestamp:

Aug 29, 2011, 9:30:53 AM (15 years ago)

Author:

rhenders

Message:

checking FITS file is ok before proceeding; added some log messages when a batch fails;

File:

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

trunk/ippToPsps/jython/batch.py

@@ -47 +47 @@
         self.doc = doc
         self.fits = fits
-        if self.fits: self.header = self.fits.getPrimaryHeader()
 
         # set up logging
@@ -53 +52 @@
         self.logger.infoSeparator()
         self.logger.debug("Batch class constructor")
+
+        # check FITS file is ok - TODO could be neater
+        if self.fits: 
+            self.header = self.fits.getPrimaryHeader()
+            if not self.header: return
 
         # set up class variables
@@ -315 +319 @@
     @staticmethod
     def publishToDatastore(datastore, ippToPspsDb, batchID, batchName, subDir, tarballFile):
+
         if datastore.publish(batchName, subDir, tarballFile, "tgz"):
             ippToPspsDb.updateLoadedToDatastore(batchID, 1)
@@ -518 +523 @@
         self.createEmptyPspsTables()
         self.importIppTables()
-        if self.populatePspsTables():
-            if self.exportPspsTablesToFits():
+        if not self.populatePspsTables():
+            self.logger.errorPair("Aborting this batch", "unable to populate PSPS tables")
+        else:
+            if not self.exportPspsTablesToFits():
+                self.logger.errorPair("Aborting this batch", "unable to export tables to FITS file")
+            else:
                 self.writeBatchManifest()
                 if int(self.doc.find("options/publishToDatastore").text): self.tarZipAndpublishToDatastore()