Changeset 38794 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Oct 6, 2015, 3:38:02 PM (11 years ago)

Author:

watersc1

Message:

Fix psfModelID type issue in ForcedWarpMeta/StackMeta, and implement psfModelID for ImageMeta. Added getFitModelID function to do the conversion of string to int.

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -225 +225 @@
         fwhm_maj    = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
         fwhm_maj_uq = self.getKeyFloat(header, "%.8f", 'FW_MJ_UQ')
-        psfmodel    = self.getKeyValue(header, 'PSFMODEL')
+        psfmodel_name    = self.getKeyValue(header, 'PSFMODEL')
+        psfmodelID  = self.scratchDb.getFitModelID(psfmodel_name)
 
         ast_cdx = self.getKeyFloat(header, "%.8f",'AST_CDX')
@@ -259 +260 @@
         sqlLine.group("completMag",       self.getKeyFloat(header, "%.8f", 'FLIMIT'))
         sqlLine.group("expTime",       self.getKeyFloat(header, "%.5f", 'EXPTIME'))  
-        sqlLine.group("psfModelID",    psfmodel)           
+        sqlLine.group("psfModelID",    psfmodelID)           
         sqlLine.group("psfFwhm_mean",  fwhm_maj)      
         sqlLine.group("psfFwhm_max",   fwhm_maj_uq)