Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions trunk/bin/lscnewcalib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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)
4 changes: 2 additions & 2 deletions trunk/src/lsc/lscsnoopy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down