Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TSNR value when cframe mask or ivar=0 #2341

Merged
merged 3 commits into from
Aug 23, 2024
Merged

Fix TSNR value when cframe mask or ivar=0 #2341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43d3021
Avoid unstable correction if fiber is off from target. Use cframe mas…
julienguy Aug 23, 2024
9bf0009
calc_tsnr2 needs cframe
julienguy Aug 23, 2024
f0c8c87
calc_tsnr2 needs cframe
julienguy Aug 23, 2024
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
3 changes: 2 additions & 1 deletion bin/desi_tsnr_afterburner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,13 @@ def compute_tsnr_values(cframe_filename,cframe_hdulist,night,expid,camera,specpr
sky = cframe_filename.replace('cframe', 'sky')
psf = cframe_filename.replace('cframe', 'psf')

cframe=read_frame(cframe_filename, skip_resolution=True)
frame=read_frame(iin, skip_resolution=True)
fiberflat=read_fiberflat(flat)
fluxcalib=read_flux_calibration(calib)
skymodel=read_sky(sky)

results, alpha = calc_tsnr2(frame, fiberflat=fiberflat,
results, alpha = calc_tsnr2(cframe, frame, fiberflat=fiberflat,
skymodel=skymodel, fluxcalib=fluxcalib, alpha_only=alpha_only)

table=Table()
Expand Down
2 changes: 1 addition & 1 deletion py/desispec/scripts/procexp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def main(args):

if not args.no_tsnr:
log.info("calculating tsnr")
results, alpha = calc_tsnr2(uncalibrated_frame, fiberflat=fiberflat, skymodel=skymodel, fluxcalib=fluxcalib, alpha_only=args.alpha_only)
results, alpha = calc_tsnr2(frame,uncalibrated_frame, fiberflat=fiberflat, skymodel=skymodel, fluxcalib=fluxcalib, alpha_only=args.alpha_only)

frame.meta['TSNRALPH'] = alpha

Expand Down
14 changes: 8 additions & 6 deletions py/desispec/tsnr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ def calc_tsnr_fiberfracs(fibermap, etc_fiberfracs, no_offsets=False):
# = (rel. fiber frac-offset correction for psf in seeing) / (rel. fiber frac-offset correction for psf in 1.1'') / plate scale**2 [flux calib * fiberflat]
#

notnull = rel_psf_loss_1p1 > 0.0
notnull = (rel_psf_loss_1p1 > 0.01) # do not do the subtle correction of relative fiber loss vs seeing compare to 1.1'' if the fiber is off target

for tracer in ['psf', 'mws', 'qso', 'lya', 'gpbbackup']:
tsnr_fiberfracs[tracer] = np.ones_like(rel_psf_loss)
Expand Down Expand Up @@ -963,13 +963,14 @@ def calc_tsnr2_cframe(cframe):
skymodel = read_sky(skyfile)
fluxcalib = read_flux_calibration(fluxcalibfile)

return calc_tsnr2(frame, fiberflat, skymodel, fluxcalib)
return calc_tsnr2(cframe, frame, fiberflat, skymodel, fluxcalib)

def calc_tsnr2(frame, fiberflat, skymodel, fluxcalib, alpha_only=False, include_poisson=True, include_fiberfracs=True):
def calc_tsnr2(cframe, frame, fiberflat, skymodel, fluxcalib, alpha_only=False, include_poisson=True, include_fiberfracs=True):
'''
Compute template SNR^2 values for a given frame

Args:
cframe : calibrated Frame object for one camera
frame : uncalibrated Frame object for one camera
fiberflat : FiberFlat object
sky : SkyModel object
Expand Down Expand Up @@ -1100,9 +1101,10 @@ def calc_tsnr2(frame, fiberflat, skymodel, fluxcalib, alpha_only=False, include_
if alpha_only:
return {}, alpha

maskfactor = np.ones_like(frame.mask, dtype=float)
maskfactor[frame.mask > 0] = 0.0
maskfactor *= (frame.ivar > 0.0)
# use cframe instead of frame mask and ivar
maskfactor = np.ones_like(cframe.mask, dtype=float)
maskfactor[cframe.mask > 0] = 0.0
maskfactor *= (cframe.ivar > 0.0)
tsnrs = {}

for tracer in ensemble.keys():
Expand Down
Loading