IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37232


Ignore:
Timestamp:
Aug 12, 2014, 2:04:38 PM (12 years ago)
Author:
eugene
Message:

delete some test prints; more robust handling of header keywords

Location:
branches/eam_branches/ipp-20140717/ippToPsps/jython
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140717/ippToPsps/jython/batch.py

    r37219 r37232  
    253253         if key in header:
    254254             value = format % float(header[key])
    255              return value
    256255         else:
    257256             self.logger.errorPair("Missing header field", key)
    258              return "NULL"
     257             value = format % -999.9
     258
     259         return value
     260
     261    '''
     262    Returns the string keyword value from this header or else "NULL"
     263    '''
     264    def getKeyInt(self, header, defValue, key):
     265
     266         if key in header:
     267             value = str(int(header[key]))
     268         else:
     269             self.logger.errorPair("Missing header field", key)
     270             value = str(defValue)
     271
     272         return value
    259273
    260274    '''

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

    r37219 r37232  
    171171
    172172        sql = sqlLine.make(") VALUES ( ", ")")
    173         print "frame meta sql: ", sql
    174 
    175         self.scratchDb.execute(sql)
     173
     174        try: self.scratchDb.execute(sql)
     175        except:
     176            self.logger.errorPair('failed sql: ', sql)
     177            raise
     178
    176179        self.scratchDb.updateAllRows("FrameMeta", "batchID", str(self.batchID))
    177180        self.scratchDb.updateAllRows("FrameMeta", "surveyID", str(self.surveyID))
    … …  
    195198        else: ccdID = 0
    196199
    197         psfFwhmMajor = self.getKeyValue(header, 'FWHM_MAJ')
    198         psfFwhmMinor = self.getKeyValue(header, 'FWHM_MIN')
    199         if ((psfFwhmMajor == "NULL") or (psfFwhmMajor == "NULL")):
    200             psfFwhm = "NULL"
    201         else:
    202             psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
     200        psfFwhmMajor = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
     201        psfFwhmMinor = self.getKeyFloat(header, "%.8f", 'FWHM_MIN')
     202        psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
    203203
    204204        # insert image metadata into table
    … …  
    217217        sqlLine.group("numAstroRef",      self.getKeyValue(header, 'NASTRO'))
    218218        sqlLine.group("numPhotoRef",      self.getKeyValue(header, 'NASTRO'))
    219         sqlLine.group("nx",               self.getKeyValue(header, 'CNAXIS1'))
    220         sqlLine.group("ny",               self.getKeyValue(header, 'CNAXIS2'))
     219        sqlLine.group("nx",               self.getKeyInt(header, 0, 'CNAXIS1'))
     220        sqlLine.group("ny",               self.getKeyInt(header, 0, 'CNAXIS2'))
    221221        sqlLine.group("psfFwhm",          str(psfFwhm))
    222         sqlLine.group("psfWidMajor",      str(psfFwhmMajor))
    223         sqlLine.group("psfWidMinor",      str(psfFwhmMinor))
     222        sqlLine.group("psfWidMajor",      psfFwhmMajor)
     223        sqlLine.group("psfWidMinor",      psfFwhmMinor)
    224224        sqlLine.group("psfTheta",         self.getKeyFloat(header, "%.8f", 'ANGLE'))
    225         sqlLine.group("momentsMajor",     self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
    226         sqlLine.group("momentsMinor",     self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
     225        sqlLine.group("momentMajor",      self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
     226        sqlLine.group("momentMinor",      self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
    227227        sqlLine.group("momentM2C",        self.getKeyFloat(header, "%.8f", 'IQ_M2C'))
    228228        sqlLine.group("momentM2S",        self.getKeyFloat(header, "%.8f", 'IQ_M2S'))
    … …  
    254254        sqlLine.group("pc002001",         self.getKeyFloat(header, "%.8e", 'PC002001'))
    255255        sqlLine.group("pc002002",         self.getKeyFloat(header, "%.8e", 'PC002002'))
    256         sqlLine.group("polyOrder",        self.getKeyValue(header, 'NPLYTERM'))
     256        sqlLine.group("polyOrder",        self.getKeyInt(header, 0, 'NPLYTERM'))
    257257
    258258        nPolyterm = int(self.getKeyValue(header, 'NPLYTERM'))
    … …  
    294294
    295295        try: self.scratchDb.execute(sql)
    296         except: print sql
     296        except:
     297            self.logger.errorPair('failed sql: ', sql)
     298            raise
    297299
    298300        self.scratchDb.updateFilterID(tableName, self.filter)
    … …  
    818820    '''
    819821    def importIppTables(self, filter=""):
    820 
    821        if self.config.test:
    822            regex = "XY01.psf"
    823        else:
    824            regex = ".*.psf"
    825  
    826        # XXX EAM NOTE : this is fragile : requires PS1_V4
    827        # 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"
    828 
    829        # XXX EAM NOTE : this is fragile : requires PS1_V5
    830        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"
    831 
    832        return super(DetectionBatch, self).importIppTables(columns, regex)
     822       
     823        regex = ".*.psf"
     824        if self.config.test and self.config.camera == "gpc1":
     825            regex = "XY01.psf"
     826           
     827        # XXX EAM NOTE : this is fragile : requires PS1_V4
     828        # 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"
     829
     830        # XXX EAM NOTE : this is fragile : requires PS1_V5
     831        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"
     832
     833        return super(DetectionBatch, self).importIppTables(columns, regex)
    833834
    834835    '''

  • branches/eam_branches/ipp-20140717/ippToPsps/jython/ipptopspsdb.py

    r37171 r37232  
    12521252    def insertPending(self, box_id, batchType, ids):
    12531253
    1254         # print "starting insert pending"
     1254        print "starting insert pending"
    12551255
    12561256        # first delete old pending items
    … …  
    12591259                AND batch_type = '" + batchType + "'")
    12601260
    1261         # print "deleted old items"
     1261        print "deleted old items"
    12621262
    12631263        for id in ids:
    … …  
    12671267               (" + str(box_id) + ", '" + batchType + "', " + str(id) + ")"
    12681268
    1269             # print "sql: ", sql
    1270             self.execute(sql)
     1269            print "sql: ", sql
     1270
     1271            try: self.execute(sql)
     1272            except:
     1273                print "failed to insert into pending"
     1274                raise
    12711275
    12721276    '''

  • branches/eam_branches/ipp-20140717/ippToPsps/jython/loader.py

    r37168 r37232  
    202202                continue
    203203            #self.logger.infoPair("heather:","passed logic")
     204
    204205            self.ippToPspsDb.unlockTables()
    205206            #self.logger.infoPair("heather:","unlock table")
    206             # self.ippToPspsDb.deletePendingItem(batchType, id)
     207
     208            self.ippToPspsDb.deletePendingItem(batchType, id)
    207209            #self.logger.infoPair("heather:","deleted pending item")
    208210

  • branches/eam_branches/ipp-20140717/ippToPsps/jython/sqlUtility.py

    r37156 r37232  
    1616   
    1717    def group(self,field,value):
    18         print "group field: " + field + ", value: " + value
    1918        self.fields.append(field)
    2019        self.values.append(value)
Note: See TracChangeset for help on using the changeset viewer.