Changeset 37237

Timestamp:

Aug 12, 2014, 2:53:01 PM (12 years ago)

Author:

eugene

Message:

robustify header fields

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py (modified) (2 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

@@ -143 +143 @@
            self.projectionID = 0
            self.skycellID = skycellName[8:11]
+       if self.skycellID == "":
+           self.skycellID = -1
 
        self.analysisVer = metadata[2];
-       if self.analysisVer[-1] == 'M':
-           self.analysisVer = self.analysisVer[:-1]
 
        # delete PSPS tables
@@ -216 +216 @@
         self.logger.infoPair("Populating table", tablename)
 
-        fwhm_maj    = self.getKeyValue(header, 'FWHM_MAJ')
-        fwhm_maj_uq = self.getKeyValue(header, 'FW_MJ_UQ')
+        fwhm_maj    = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
+        fwhm_maj_uq = self.getKeyFloat(header, "%.8f", 'FW_MJ_UQ')
         psfmodel    = self.getKeyValue(header, 'PSFMODEL')
-
-        if (fwhm_maj    == "NULL"): fwhm_maj    = -999
-        if (fwhm_maj_uq == "NULL"): fwhm_maj_uq = -999
 
         # make a table