Changeset 33825

Timestamp:

Apr 20, 2012, 4:05:06 PM (14 years ago)

Author:

rhenders

Message:

scaling Kron flux and Kron flux error by expTime as PSPS wants instrumental per unit time

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (3 diffs)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -416 +416 @@
                ,momentYY \
                ,apMag \
+               ,kronFlux \
+               ,kronFluxErr \
                ,infoFlag \
                ,sky \
@@ -434 +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 \
@@ -446 +448 @@
                ,MOMENTS_YY \
                ,AP_MAG \
+               ,KRON_FLUX / " + self.header['EXPTIME'] + " \
+               ,KRON_FLUX_ERR / " + self.header['EXPTIME'] + " \
                ,FLAGS\
                ,SKY \

trunk/ippToPsps/jython/stackbatch.py

@@ -364 +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 \
@@ -387 +387 @@
                ,AP_MAG \
                , NULL \
-               ,KRON_FLUX \
-               ,KRON_FLUX_ERR \
+               ,KRON_FLUX / " + str(self.expTime) + " \
+               ,KRON_FLUX_ERR / " + str(self.expTime) + " \
                , NULL \
                , NULL \