Changeset 37232 for branches/eam_branches/ipp-20140717/ippToPsps/jython/detectionbatch.py

Timestamp:

Aug 12, 2014, 2:04:38 PM (12 years ago)

Author:

eugene

Message:

delete some test prints; more robust handling of header keywords

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/detectionbatch.py (modified) (6 diffs)

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

@@ -171 +171 @@
 
         sql = sqlLine.make(") VALUES ( ", ")")
-        print "frame meta sql: ", sql
-
-        self.scratchDb.execute(sql)
+
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair('failed sql: ', sql)
+            raise
+
         self.scratchDb.updateAllRows("FrameMeta", "batchID", str(self.batchID))
         self.scratchDb.updateAllRows("FrameMeta", "surveyID", str(self.surveyID))
@@ -195 +198 @@
         else: ccdID = 0
 
-        psfFwhmMajor = self.getKeyValue(header, 'FWHM_MAJ')
-        psfFwhmMinor = self.getKeyValue(header, 'FWHM_MIN')
-        if ((psfFwhmMajor == "NULL") or (psfFwhmMajor == "NULL")):
-            psfFwhm = "NULL"
-        else:
-            psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
+        psfFwhmMajor = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
+        psfFwhmMinor = self.getKeyFloat(header, "%.8f", 'FWHM_MIN')
+        psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
 
         # insert image metadata into table
@@ -217 +217 @@
         sqlLine.group("numAstroRef",      self.getKeyValue(header, 'NASTRO'))
         sqlLine.group("numPhotoRef",      self.getKeyValue(header, 'NASTRO'))
-        sqlLine.group("nx",               self.getKeyValue(header, 'CNAXIS1'))
-        sqlLine.group("ny",               self.getKeyValue(header, 'CNAXIS2'))
+        sqlLine.group("nx",               self.getKeyInt(header, 0, 'CNAXIS1'))
+        sqlLine.group("ny",               self.getKeyInt(header, 0, 'CNAXIS2'))
         sqlLine.group("psfFwhm",          str(psfFwhm))
-        sqlLine.group("psfWidMajor",      str(psfFwhmMajor))
-        sqlLine.group("psfWidMinor",      str(psfFwhmMinor))
+        sqlLine.group("psfWidMajor",      psfFwhmMajor)
+        sqlLine.group("psfWidMinor",      psfFwhmMinor)
         sqlLine.group("psfTheta",         self.getKeyFloat(header, "%.8f", 'ANGLE'))
-        sqlLine.group("momentsMajor",     self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
-        sqlLine.group("momentsMinor",     self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
+        sqlLine.group("momentMajor",      self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
+        sqlLine.group("momentMinor",      self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
         sqlLine.group("momentM2C",        self.getKeyFloat(header, "%.8f", 'IQ_M2C'))
         sqlLine.group("momentM2S",        self.getKeyFloat(header, "%.8f", 'IQ_M2S'))
@@ -254 +254 @@
         sqlLine.group("pc002001",         self.getKeyFloat(header, "%.8e", 'PC002001'))
         sqlLine.group("pc002002",         self.getKeyFloat(header, "%.8e", 'PC002002'))
-        sqlLine.group("polyOrder",        self.getKeyValue(header, 'NPLYTERM'))
+        sqlLine.group("polyOrder",        self.getKeyInt(header, 0, 'NPLYTERM'))
 
         nPolyterm = int(self.getKeyValue(header, 'NPLYTERM'))
@@ -294 +294 @@
 
         try: self.scratchDb.execute(sql)
-        except: print sql
+        except:
+            self.logger.errorPair('failed sql: ', sql)
+            raise
 
         self.scratchDb.updateFilterID(tableName, self.filter)
@@ -818 +820 @@
     '''
     def importIppTables(self, filter=""):
-
-       if self.config.test:
-           regex = "XY01.psf"
-       else: 
-           regex = ".*.psf"
-  
-       # XXX EAM NOTE : this is fragile : requires PS1_V4
-       # columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PSF_INST_FLUX PSF_INST_FLUX_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG AP_FLUX KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ"
-
-       # XXX EAM NOTE : this is fragile : requires PS1_V5
-       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG POSANGLE PLTSCALE PSF_INST_FLUX PSF_INST_FLUX_SIG PSF_FWHM_MAJ PSF_FWHM_MIN PSF_THETA PSF_CORE PSF_QF PSF_QF_PERFECT PSF_CHISQ EXT_NSIGMA MOMENTS_XX MOMENTS_XY MOMENTS_YY MOMENTS_R1 MOMENTS_RH MOMENTS_M3C MOMENTS_M3S MOMENTS_M4C MOMENTS_M4S AP_FLUX AP_FLUX_SIG AP_NPIX AP_MAG_RADIUS KRON_FLUX KRON_FLUX_ERR SKY SKY_SIGMA FLAGS FLAGS2"
-
-       return super(DetectionBatch, self).importIppTables(columns, regex)
+        
+        regex = ".*.psf"
+        if self.config.test and self.config.camera == "gpc1":
+            regex = "XY01.psf"
+            
+        # XXX EAM NOTE : this is fragile : requires PS1_V4
+        # columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PSF_INST_FLUX PSF_INST_FLUX_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG AP_FLUX KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ"
+
+        # XXX EAM NOTE : this is fragile : requires PS1_V5
+        columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG POSANGLE PLTSCALE PSF_INST_FLUX PSF_INST_FLUX_SIG PSF_FWHM_MAJ PSF_FWHM_MIN PSF_THETA PSF_CORE PSF_QF PSF_QF_PERFECT PSF_CHISQ EXT_NSIGMA MOMENTS_XX MOMENTS_XY MOMENTS_YY MOMENTS_R1 MOMENTS_RH MOMENTS_M3C MOMENTS_M3S MOMENTS_M4C MOMENTS_M4S AP_FLUX AP_FLUX_SIG AP_NPIX AP_MAG_RADIUS KRON_FLUX KRON_FLUX_ERR SKY SKY_SIGMA FLAGS FLAGS2"
+
+        return super(DetectionBatch, self).importIppTables(columns, regex)
 
     '''