Changeset 39134 for trunk/ippToPsps/jython/diffbatch.py

Timestamp:

Nov 13, 2015, 12:11:58 PM (11 years ago)

Author:

eugene

Message:

use sas40 inv.cmf / cmf files for diff test; use str(foo) to match column names

File:

• trunk/ippToPsps/jython/diffbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/diffbatch.py

@@ -775 +775 @@
             for table in tables:
                 # check for AP_NPIX columns: missing for SAS39
-                if table.name == "SkyChip_psf":
+                self.logger.debugPair("checking table", table.name)
+                if table.name == "SkyChip.psf":
                     columns = table.columns()
-                    if 'AP_NPIX' in columns:
-                        self.haveApNpix[num] = 1
-                    if 'PSF_FWHM_MAJ' in columns:
-                        self.havePsfFwhm[num] = 1
-                    if 'SRC_CHIP_X' in columns:
-                        self.haveSrcPos[num] = 1
-
+                    for column in columns:
+                        columnString = str(column)
+                        if columnString == 'AP_NPIX': 
+                            self.haveApNpix[num] = 1
+                            self.logger.debugPair("found AP_NPIX in file", fileNamePos)
+                        if columnString == 'PSF_FWHM_MAJ':
+                            self.havePsfFwhm[num] = 1
+                            self.logger.debugPair("found PSF_FWHM_MAG in file", fileNamePos)
+                        if columnString == 'SRC_CHIP_X':
+                            self.haveSrcPos[num] = 1
+                            self.logger.debugPair("found SRC_CHIP_X in file", fileNamePos)
 
                 myTable = table.name.replace(".","_") + "_" + str(num)