diff --git a/pyreduce/instruments/mcdonald.py b/pyreduce/instruments/mcdonald.py index d70f681e..f4f9fa6f 100644 --- a/pyreduce/instruments/mcdonald.py +++ b/pyreduce/instruments/mcdonald.py @@ -116,7 +116,7 @@ def add_header_info(self, header, mode, **kwargs): def get_wavecal_filename(self, header, mode, **kwargs): """Get the filename of the wavelength calibration config file""" cwd = os.path.dirname(__file__) - fname = "{instrument}_{mode}_2D.npz".format(instrument="mcdonald", mode=mode) + fname = "mcdonald.npz" fname = os.path.join(cwd, "..", "wavecal", fname) return fname diff --git a/pyreduce/settings/settings_MCDONALD.json b/pyreduce/settings/settings_MCDONALD.json index fbdd5c70..19ccf83a 100644 --- a/pyreduce/settings/settings_MCDONALD.json +++ b/pyreduce/settings/settings_MCDONALD.json @@ -28,10 +28,12 @@ "extraction_width": 10 }, "wavecal": { - "threshold": 100, - "dimensionality": "2D", - "degree": [6, 6], - "manual": false + "threshold": 500, + "dimensionality": "1D", + "degree": 8, + "manual": false, + "element": "thar", + "medium": "vac" }, "freq_comb_master": { "extraction_width": 10 diff --git a/pyreduce/wavecal/mcdonald.npz b/pyreduce/wavecal/mcdonald.npz new file mode 100644 index 00000000..aa30dc76 Binary files /dev/null and b/pyreduce/wavecal/mcdonald.npz differ