Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/detectionbatch.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

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

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

@@ -53 +53 @@
                useFullTables)
 
-       if not self.everythingOK: return
-
        # get camera meta data
        meta = self.gpc1Db.getCameraStageMeta(self.id)
        if not meta:
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get", "camera metadata")
+           raise
 
        self.expID = meta[0];
@@ -93 +91 @@
        # get a fre primary header values. if in test mode, then use defaults
        if self.safeDictionaryAccessWithDefault(self.header, 'MJD-OBS', "1") == "NULL":
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get", "MJD-OBS")
+           raise
 
        if self.safeDictionaryAccessWithDefault(self.header, 'EXPTIME', "1") == "NULL":
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get", "EXPTIME")
+           raise
 
        if self.safeDictionaryAccessWithDefault(self.header, 'FILTERID', "g.0000") == "NULL":
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get", "FILTERID")
+           raise
        
        self.obsTime = float(self.header['MJD-OBS']) + (float(self.header['EXPTIME']) / 172800.0)
@@ -418 +416 @@
                ,momentYY \
                ,apMag \
+               ,kronFlux \
+               ,kronFluxErr \
                ,infoFlag \
                ,sky \
@@ -436 +436 @@
                ,X_PSF_SIG \
                ,Y_PSF_SIG \
-               ,POW(10.0, (-0.4*PSF_INST_MAG)) / "+self.header['EXPTIME']+" \
-               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / "+self.header['EXPTIME']+")) / 1.085736) \
-               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / "+self.header['EXPTIME']+" \
+               ,POW(10.0, (-0.4*PSF_INST_MAG)) / " + self.header['EXPTIME'] + " \
+               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / " + self.header['EXPTIME'] + ")) / 1.085736) \
+               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / " + self.header['EXPTIME'] + " \
                ,PSF_MAJOR \
                ,PSF_MINOR \
@@ -448 +448 @@
                ,MOMENTS_YY \
                ,AP_MAG \
+               ,KRON_FLUX / " + self.header['EXPTIME'] + " \
+               ,KRON_FLUX_ERR / " + self.header['EXPTIME'] + " \
                ,FLAGS\
                ,SKY \
@@ -755 +757 @@
        else : regex = ".*.psf"
   
-       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG FLAGS SKY SKY_SIGMA EXT_NSIGMA"
+       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG KRON_FLUX KRON_FLUX_ERR FLAGS SKY SKY_SIGMA EXT_NSIGMA"
 
        return super(DetectionBatch, self).importIppTables(columns, regex)