Skip to content

Commit

Permalink
Minor corrections and cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
Olesja Smirnova committed Dec 24, 2022
1 parent 2155696 commit 68669c4
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
3 changes: 2 additions & 1 deletion geminidr/f2/primitives_f2_spect.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ def _get_arc_linelist(self, waves=None, ad=None):
else:
linelist = 'sky.dat'

self.log.stdinfo(f"Using linelist {linelist}")
filename = os.path.join(lookup_dir, linelist)
return wavecal.LineList(filename)

Expand All @@ -161,5 +162,5 @@ def _get_cenwave_offset(self, ad=None):
return mask.cenwaveoffset if mask else None

def _get_cenwave_accuracy(self, ad=None):
# Accuracy of central wavelength (nm) for a given setup.
# Accuracy of central wavelength (nm) for a given instrument/setup.
return 10
2 changes: 1 addition & 1 deletion geminidr/gmos/primitives_gmos_spect.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,5 +431,5 @@ def _get_arc_linelist(self, waves=None, ad=None):
return wavecal.LineList(filename)

def _get_cenwave_accuracy(self, ad=None):
# Accuracy of central wavelength (nm) for a given setup.
# Accuracy of central wavelength (nm) for a given instrument/setup.
return 10
17 changes: 9 additions & 8 deletions geminidr/gnirs/primitives_gnirs_spect.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def determineWavelengthSolution(self, adinputs=None, **params):
if 'ARC' in ad.tags:
if params["min_snr"] is None:
params["min_snr"] = 20
self.log.stdinfo(f'Parameter "min_snr" is set to None. Using min_snr={params["min_snr"]}')
if params["debug_min_lines"] is None:
params["debug_min_lines"] = 100000

Expand All @@ -173,6 +174,7 @@ def determineWavelengthSolution(self, adinputs=None, **params):
params["order"] = 1
else:
params["order"] = 3
self.log.stdinfo(f'Parameter "order" is set to None. Using order={params["order"]}')
else:
params["lsigma"] = 2
params["hsigma"] = 2
Expand All @@ -187,10 +189,10 @@ def determineWavelengthSolution(self, adinputs=None, **params):
params["order"] = 1
else:
params["order"] = 3

self.log.stdinfo(f'Parameter "order" is set to None. Using order={params["order"]}')
if params["min_snr"] is None:
params["min_snr"] = 10

self.log.stdinfo(f'Parameter "min_snr" is set to None. Using min_snr={params["min_snr"]}')
adinputs = super().determineWavelengthSolution(adinputs, **params)
return adinputs

Expand Down Expand Up @@ -273,12 +275,16 @@ def determineDistortion(self, adinputs=None, **params):
params["spectral_order"] = 1
else:
params["spectral_order"] = 2
self.log.stdinfo(f'Parameter "spectral_order" is set to None. '
f'Using spectral_order={params["spectral_order"]}')

if params["min_line_length"] is None:
if cam.startswith('Long'):
params["min_line_length"] = 0.8
else:
params["min_line_length"] = 0.6
self.log.stdinfo(f'Parameter "min_line_length" is set to None. '
f'Using min_line_length={params["min_line_length"]}')
adinputs = super().determineDistortion(adinputs, **params)
return adinputs

Expand Down Expand Up @@ -353,17 +359,12 @@ def _get_resolution(self, ad=None):
config = f"{filter}, {grating}, {pix_scale}"

resolution_2pix = resolution_2pix_slit.get(config)
print(f"ad.slit_width()={ad.slit_width()}")

slit_width_pix = ad.slit_width()/pix_scale
print(f"resolution_2pix={resolution_2pix}")
print(f"resolution_2pix={slit_width_pix}")
print(f"resolution_2pix * 2 / slit_width_pix={resolution_2pix * 2 / slit_width_pix}")

return resolution_2pix * 2 / slit_width_pix

def _get_cenwave_accuracy(self, ad=None):
# Accuracy of central wavelength (nm) for a given setup.
# Accuracy of central wavelength (nm) for a given instrument/setup.
# According to GNIRS instrument pages "wavelength settings are accurate
# to better than 5 percent of the wavelength coverage".
# However using 7% covers more cases. For the arcs dc0=10 works just fine for all modes.
Expand Down
4 changes: 2 additions & 2 deletions geminidr/gnirs/recipes/sq/recipes_LS_SPECT.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ def reduceScience(p):
p.storeProcessedScience(suffix="_1D")


def wavecalFromSkyLines(p):
def makeWavelengthSolution(p):
"""
Process GNIRS longslist science in order to create wavelength and distortion
solutions.
solutions using sky emission lines.
Inputs are:
* raw science - no other calibrations required.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
'fwidth': None,
'order': None,
'min_snr': None,
'debug_min_lines': None,
'in_vacuo': True
}

Expand Down
3 changes: 2 additions & 1 deletion geminidr/niri/primitives_niri_spect.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ def _get_arc_linelist(self, waves=None, ad=None):
else:
linelist = 'nearIRsky.dat'

self.log.stdinfo(f"Using linelist {linelist}")
filename = os.path.join(lookup_dir, linelist)

return wavecal.LineList(filename)

def _get_cenwave_accuracy(self, ad=None):
# Accuracy of central wavelength (nm) for a given setup.
# Accuracy of central wavelength (nm) for a given instrument/setup.
return 10

0 comments on commit 68669c4

Please sign in to comment.