diff --git a/pyreduce/instruments/HARPSPOL/__init__.py b/pyreduce/instruments/HARPSPOL/__init__.py index 2afbc74d..2827a510 100644 --- a/pyreduce/instruments/HARPSPOL/__init__.py +++ b/pyreduce/instruments/HARPSPOL/__init__.py @@ -59,11 +59,6 @@ def get_expected_values( "night": night, "type": r"(LAMP,LAMP),TUN", }, - "scatter": { - "instrument": "HARPS", - "night": night, - "type": r"(LAMP,LAMP),TUN", - }, "curvature": { "instrument": "HARPS", "night": night, @@ -146,7 +141,8 @@ def get_wavecal_filename(self, header, channel, **kwargs): Uses the HARPS non-pol NPZ files, since both beams see the same spectral orders and the non-pol linelist has N orders matching - per-group trace counts. + per-group trace counts. Order 0 is the bluest, matching the + blue-first trace numbering used since the 0.9 trace rewrite. """ harps_dir = join(dirname(dirname(__file__)), "HARPS") fname = f"wavecal_{channel.lower()}_2D.npz" @@ -162,6 +158,8 @@ def get_mask_filename(self, channel, **kwargs): def get_wavelength_range(self, header, channel, **kwargs): wave_range = super().get_wavelength_range(header, channel, **kwargs) - # Reverse order (same as HARPS) + # Config lists red→blue (5245→3779 A). Since the 0.9 trace rewrite, + # traces are numbered bottom-up = blue-first, so the guess must be + # reversed to blue→red to line up with spectrum rows. wave_range = wave_range[::-1] return wave_range diff --git a/pyreduce/instruments/HARPSPOL/settings.json b/pyreduce/instruments/HARPSPOL/settings.json index b42b8cd5..d0a332f4 100644 --- a/pyreduce/instruments/HARPSPOL/settings.json +++ b/pyreduce/instruments/HARPSPOL/settings.json @@ -10,9 +10,6 @@ "manual": false, "border_width": [10, 10, 0, 0] }, - "scatter": { - "extraction_height": 20 - }, "norm_flat": { "smooth_slitfunction": 2, "extraction_height": 20,