Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/stackbatch.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/stackbatch.py (modified) (4 diffs)

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

@@ -50 +50 @@
                useFullTables)
 
-       if not self.everythingOK: return
-
        self.stackType = "DEEP_STACK" # TODO
 
@@ -57 +55 @@
        meta = self.gpc1Db.getStackStageMeta(self.id)
        if not meta:
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get stack", "metadata")
+           raise
 
        self.filter = meta[0];
@@ -366 +364 @@
                ,X_PSF_SIG \
                ,Y_PSF_SIG \
-               ,POW(10.0, (-0.4*PSF_INST_MAG)) / "+str(self.expTime)+" \
-               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / "+str(self.expTime)+")) / 1.085736) \
-               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / "+str(self.expTime)+" \
+               ,POW(10.0, (-0.4*PSF_INST_MAG)) / " + str(self.expTime) + " \
+               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / " + str(self.expTime) + ")) / 1.085736) \
+               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / " + str(self.expTime) + " \
                ,SKY \
                ,SKY_SIGMA \
@@ -389 +387 @@
                ,AP_MAG \
                , NULL \
-               ,KRON_FLUX \
-               ,KRON_FLUX_ERR \
+               ,KRON_FLUX / " + str(self.expTime) + " \
+               ,KRON_FLUX_ERR / " + str(self.expTime) + " \
                , NULL \
                , NULL \