From 7017f5f5e5f0ce983b8aed7685a7c9c3b6549b05 Mon Sep 17 00:00:00 2001 From: Moira Andrews Date: Mon, 20 Jul 2026 16:54:20 -0700 Subject: [PATCH] fix errors in the apmag calls with the flux header and swaps the readnoise and gain in the iraf calls --- trunk/bin/lscnewcalib.py | 10 +++++----- trunk/src/lsc/lscsnoopy.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/bin/lscnewcalib.py b/trunk/bin/lscnewcalib.py index f69eda8c..abbce27a 100755 --- a/trunk/bin/lscnewcalib.py +++ b/trunk/bin/lscnewcalib.py @@ -224,8 +224,8 @@ def crossmatch(_ra0, _dec0, _ra1, _dec1, tollerance): # degree,degree,degree,de lsc.mysqldef.updatevalue('photlco', 'zn', float(ZZ0), string.split(re.sub('sn2.', '', img), '/')[-1]) lsc.mysqldef.updatevalue('photlco', 'dzn', float(std2), string.split(re.sub('sn2.', '', img), '/')[-1]) lsc.mysqldef.updatevalue('photlco', 'znnum', len(data2), string.split(re.sub('sn2.', '', img), '/')[-1]) - headers = {'zn': [float(ZZ0), 'zeropoint'], 'dzn': [float(std2), 'zeropoint std'], - 'znnum': [len(data2), 'number of stars used for zeropoint']} + headers = {'zn': float(ZZ0), 'dzn': float(std2), + 'znnum': len(data2)} lsc.util.updateheader(img, 0, headers) print 'zero point ', ZZ0 from pyraf import iraf @@ -260,8 +260,8 @@ def crossmatch(_ra0, _dec0, _ra1, _dec1, tollerance): # degree,degree,degree,de 20. / _pixelscale) ap = str(a1) + "," + str(a2) + "," + str(a3) iraf.noao.digiphot.daophot.photpars.zmag = 0 - iraf.noao.digiphot.daophot.datapars.readnoi = _gain #1.4 #_ron - iraf.noao.digiphot.daophot.datapars.epadu = _ron # 13 #_gain + iraf.noao.digiphot.daophot.datapars.readnoi = _ron #1.4 #_ron + iraf.noao.digiphot.daophot.datapars.epadu = _gain # 13 #_gain iraf.noao.digiphot.daophot.datapars.datamin = _datamin iraf.noao.digiphot.daophot.datapars.datamax = _datamax iraf.noao.daophot.fitskypars.salgori = 'centroid' # 'median', default is 'mode' @@ -354,5 +354,5 @@ def crossmatch(_ra0, _dec0, _ra1, _dec1, tollerance): # degree,degree,degree,de except: pass - headers = {'apflux': [float(flux1) / _exptime, ''], 'dapflux': [float(error1) / _exptime, '']} + headers = {'apflux': float(flux1) / _exptime, 'dapflux': float(error1) / _exptime} lsc.util.updateheader(img, 0, headers) diff --git a/trunk/src/lsc/lscsnoopy.py b/trunk/src/lsc/lscsnoopy.py index 54ca303a..f3f9e885 100755 --- a/trunk/src/lsc/lscsnoopy.py +++ b/trunk/src/lsc/lscsnoopy.py @@ -29,8 +29,8 @@ def fitsn(img,imgpsf,coordlist,_recenter,fwhm0,original,sn,residual,_show,_inter _ron=lsc.util.readkey3(hdr,'ron') _exptime=lsc.util.readkey3(hdr,'exptime') iraf.noao.digiphot.daophot.photpars.zmag = 0 - iraf.noao.digiphot.daophot.datapars.readnoi = _gain - iraf.noao.digiphot.daophot.datapars.epadu = _ron + iraf.noao.digiphot.daophot.datapars.readnoi = _ron + iraf.noao.digiphot.daophot.datapars.epadu = _gain iraf.noao.digiphot.daophot.datapars.datamin = dmin iraf.noao.digiphot.daophot.datapars.datamax = dmax iraf.noao.daophot.fitskypars.annulus=a3