Changeset 39224 for branches/eam_branches/ipp-20151113/tools/bills/adddeltacolumns

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• tools/bills/adddeltacolumns (modified) (4 diffs)

branches/eam_branches/ipp-20151113/tools/bills/adddeltacolumns

@@ -152 +152 @@
 xPosErr         X_PSF_SIG
 yPosErr         Y_PSF_SIG
-pltScale        PLTSCALE
-posAngle        POSANGLE
+pltScale        PLTSCALE_i
+posAngle        POSANGLE_i
 ra
 dec
@@ -163 +163 @@
 expTime
 airMass
-psfFlux         PSF_INST_FLUX           *zpFactor/expTime/PSF_NDOF
+psfFlux         PSF_INST_FLUX           *zpFactor/expTime
 psfFluxErr      PSF_INST_FLUX_SIG       *zpFactor/expTime
 psfMajorFWHM    PSF_FWHM_MAJ            *abs(PLTSCALE)
@@ -171 +171 @@
 psfQf           PSF_QF
 psfQfPerfect    PSF_QF_PERFECT
-psfChiSq        PSF_CHISQ
+psfChiSq        PSF_CHISQ               /PSF_NDOF
 psfLikelihood                 # actually psfLikelihood(EXT_NSIGMA). We assume the formula is ok.
 momentXX        MOMENTS_XX              *PLTSCALE*PLTSCALE
@@ -189 +189 @@
 kronFluxErr     KRON_FLUX_ERR           *zpFactor/expTime
 kronRad         MOMENTS_R1              *2.5*abs(PLTSCALE)
-sky             SKY                     /PLTSCALE/PLTSCALE*zpFactor/expTime
+sky             SKY_i                   /PLTSCALE/PLTSCALE*zpFactor/expTime
 skyErr          SKY_SIGMA               /PLTSCALE/PLTSCALE*zpFactor/expTime
 infoFlag        FLAGS