teareduce 0.6.8__py3-none-any.whl → 0.7.0__py3-none-any.whl

teareduce/cleanest/definitions.py

@@ -139,7 +139,7 @@ VALID_CLEANING_METHODS = {
     "PyCosmic": "pycosmic",
     "deepCR": "deepcr",
     "maskfill": "maskfill",
-    "auxdata": "auxdata",
+    "Auxiliary data": "auxdata",
 }
 
 # Maximum pixel distance to consider when finding closest CR pixel

teareduce/cleanest/interpolationeditor.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2025 Universidad Complutense de Madrid
+# Copyright 2025-2026 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -9,6 +9,7 @@
 
 """Interpolation editor dialog for interpolation parameters."""
 
+import os
 import tkinter as tk
 from tkinter import messagebox
 from tkinter import ttk
@@ -33,7 +34,8 @@ class InterpolationEditor:
         last_maskfill_operator,
         last_maskfill_smooth,
         last_maskfill_verbose,
-        auxdata,
+        auxfile_list,
+        extension_auxfile_list,
         cleandata_lacosmic,
         cleandata_pycosmic,
         cleandata_deepcr,
@@ -63,8 +65,10 @@ class InterpolationEditor:
             The last used maskfill smooth parameter.
         last_maskfill_verbose : bool
             The last used maskfill verbose parameter.
-        auxdata : array-like or None
-            Auxiliary data for cleaning, if available.
+        auxfile_list : list of str
+            List of paths to auxiliary FITS files.
+        extension_auxfile_list : list of str
+            List of FITS extensions for auxiliary files.
         cleandata_lacosmic : array-like or None
             Cleaned data from L.A.Cosmic, if available.
         cleandata_pycosmic : array-like or None
@@ -99,8 +103,17 @@ class InterpolationEditor:
             The root Tkinter window.
         last_dilation : int
             The last used dilation parameter.
-        auxdata : array-like or None
-            Auxiliary data for cleaning, if available.
+        auxfile_list : list of str
+            List of paths to auxiliary FITS files.
+        extension_auxfile_list : list of str
+            List of FITS extensions for auxiliary files.
+        naux : int
+            Number of auxiliary files.
+        extension_auxfile_list : list of str
+            List of file names and extensions for auxiliary files.
+        auxiliary_data_index : int or None
+            Index of the selected auxiliary data option, ranging
+            from 1 to naux + 3 (mean, median, minimum), or None if not selected.
         cleandata_lacosmic : array-like or None
             Cleaned data from L.A.Cosmic, if available.
         cleandata_pycosmic : array-like or None
@@ -135,7 +148,22 @@ class InterpolationEditor:
         self.root = root
         self.root.title("Cleaning Parameters")
         self.last_dilation = last_dilation
-        self.auxdata = auxdata
+        self.auxfile_list = auxfile_list
+        self.naux = len(auxfile_list)
+        if len(extension_auxfile_list) != self.naux:
+            raise ValueError("Length of extension_auxfile_list must match length of auxfile_list.")
+        self.extension_auxfile_list = extension_auxfile_list
+        if self.naux == 0:
+            self.auxdata_options = []
+        else:
+            self.auxdata_options = [
+                f"{os.path.basename(self.auxfile_list[i])}[{self.extension_auxfile_list[i]}]" for i in range(self.naux)
+            ]
+            if self.naux > 1:
+                self.auxdata_options.extend(
+                    ["MEAN of auxiliary data", "MEDIAN of auxiliary data", "MINIMUM of auxiliary data"]
+                )
+        self.auxiliary_data_index = None  # to be set when OK is pressed
         self.cleandata_lacosmic = cleandata_lacosmic
         self.cleandata_pycosmic = cleandata_pycosmic
         self.cleandata_deepcr = cleandata_deepcr
@@ -158,6 +186,11 @@ class InterpolationEditor:
         self.create_widgets()
         center_on_parent(child=self.root, parent=self.root.master)
 
+    def on_combo_auxdata_change(self, event):
+        """Handle changes in the auxiliary data combobox selection."""
+        self.auxiliary_data_index = self.auxdata_options.index(self.auxdata_var.get()) + 1
+        self.action_on_method_change()
+
     def create_widgets(self):
         """Create the widgets for the dialog."""
         # Main frame
@@ -196,7 +229,7 @@ class InterpolationEditor:
                 if self.cleandata_deepcr is None:
                     state = "disabled"
             # Skip auxdata method if auxdata is not available
-            elif interp_method == "auxdata" and self.auxdata is None:
+            elif interp_method == "Auxiliary data" and self.naux == 0:
                 state = "disabled"
             tk.Radiobutton(
                 main_frame,
@@ -210,6 +243,21 @@ class InterpolationEditor:
             if column > 6:
                 column = 0
                 row += 1
+        # Add combobox to choose auxdata if auxdata method is selected and naux > 0:
+        if self.naux > 0:
+            self.auxdata_var = tk.StringVar(value=self.auxdata_options[0])
+            self.auxdata_combobox = ttk.Combobox(
+                main_frame,
+                textvariable=self.auxdata_var,
+                values=self.auxdata_options,
+                state="readonly",
+                width=40,
+            )
+            self.auxdata_combobox.grid(row=row, column=column, columnspan=4, sticky="w", padx=5, pady=5)
+            self.auxdata_combobox.config(state="disabled")
+            # --- Bind the selection event to the handler
+            self.auxdata_combobox.bind("<<ComboboxSelected>>", self.on_combo_auxdata_change)
+
         row += 1
 
         # Separator
@@ -335,6 +383,7 @@ class InterpolationEditor:
     def on_ok(self):
         """Handle the OK button click event."""
         self.cleaning_method = VALID_CLEANING_METHODS[self.cleaning_method_var.get()]
+
         try:
             self.npoints = int(self.entry_npoints.get())
         except ValueError:
@@ -434,6 +483,11 @@ class InterpolationEditor:
                     return
             self.__dict__[key] = value
 
+        if self.cleaning_method == "auxdata":
+            # set auxiliary_data_index to the index of the selected auxdata option
+            # ranging from 1 to naux + 3 (mean, median, minimum)
+            self.auxiliary_data_index = self.auxdata_options.index(self.auxdata_var.get()) + 1
+
         self.root.destroy()
 
     def on_cancel(self):
@@ -446,7 +500,16 @@ class InterpolationEditor:
     def action_on_method_change(self):
         """Handle changes in the selected cleaning method."""
         selected_method = self.cleaning_method_var.get()
-        print(f"Selected cleaning method: [red bold]{selected_method}[/red bold]")
+        if selected_method == "Auxiliary data":
+            self.auxiliary_data_index = self.auxdata_options.index(self.auxdata_var.get()) + 1
+            print(
+                f"Selected cleaning method: [red bold]{selected_method}[/red bold]: {self.auxdata_options[self.auxiliary_data_index - 1]}"
+            )
+            self.auxdata_combobox.config(state="readonly")
+        else:
+            print(f"Selected cleaning method: [red bold]{selected_method}[/red bold]")
+            self.auxdata_combobox.config(state="disabled")
+
         if selected_method in ["x interp.", "y interp."]:
             self.entry_npoints.config(state="normal")
             self.entry_degree.config(state="normal")
@@ -475,7 +538,7 @@ class InterpolationEditor:
             self.entry_maskfill_operator.config(state="disabled")
             self.entry_maskfill_smooth.config(state="disabled")
             self.entry_maskfill_verbose.config(state="disabled")
-        elif selected_method in ["L.A.Cosmic", "PyCosmic", "deepCR", "auxdata"]:
+        elif selected_method in ["L.A.Cosmic", "PyCosmic", "deepCR", "Auxiliary data"]:
             self.entry_npoints.config(state="disabled")
             self.entry_degree.config(state="disabled")
             self.entry_maskfill_size.config(state="disabled")

teareduce/cleanest/reviewcosmicray.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2025 Universidad Complutense de Madrid
+# Copyright 2025-2026 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -9,7 +9,9 @@
 
 """Define the ReviewCosmicRay class."""
 
+import os
 import tkinter as tk
+from tkinter import ttk
 from tkinter import messagebox
 from tkinter import simpledialog
 
@@ -55,8 +57,14 @@ class ReviewCosmicRay(ImageDisplay):
         root,
         root_width,
         root_height,
+        input_fits,
         data,
         auxdata,
+        auxfile_list,
+        extension_auxfile_list,
+        auxdata_mean,
+        auxdata_median,
+        auxdata_min,
         cleandata_lacosmic,
         cleandata_pycosmic,
         cleandata_deepcr,
@@ -82,10 +90,22 @@ class ReviewCosmicRay(ImageDisplay):
             The width of the root window. The review window is scaled accordingly.
         root_height : int
             The height of the root window. The review window is scaled accordingly.
+        input_fits : str
+            Path to the FITS file to be cleaned.
         data : 2D numpy array
             The original image data.
         auxdata : 2D numpy array or None
             The auxiliary image data.
+        auxfile_list : list of str
+            List of auxiliary FITS file names.
+        extension_auxfile_list : list of str
+            List of FITS extensions for auxiliary files.
+        auxdata_mean : 2D numpy array or None
+            The mean auxiliary image data.
+        auxdata_median : 2D numpy array or None
+            The median auxiliary image data.
+        auxdata_min : 2D numpy array or None
+            The minimum auxiliary image data.
         cleandata_lacosmic: 2D numpy array or None
             The cleaned image data from L.A.Cosmic.
         cleandata_pycosmic: 2D numpy array or None
@@ -160,10 +180,22 @@ class ReviewCosmicRay(ImageDisplay):
             The scaling factor for the width of the review window.
         factor_height : float
             The scaling factor for the height of the review window.
+        input_fits : str
+            Path to the FITS file to be cleaned.
         data : 2D numpy array
             The original image data.
         auxdata : 2D numpy array or None
             The auxiliary image data.
+        auxfile_list : list of str
+            List of auxiliary FITS file names.
+        extension_auxfile_list : list of str
+            List of FITS extensions for auxiliary files.
+        auxdata_mean : 2D numpy array or None
+            The mean auxiliary image data.
+        auxdata_median : 2D numpy array or None
+            The median auxiliary image data.
+        auxdata_min : 2D numpy array or None
+            The minimum auxiliary image data.
         cleandata_lacosmic: 2D numpy array or None
             The cleaned image data from L.A.Cosmic.
         cleandata_pycosmic: 2D numpy array or None
@@ -200,17 +232,46 @@ class ReviewCosmicRay(ImageDisplay):
         self.root.title(f"Review Cosmic Rays (TEA version {VERSION})")
         self.factor_width = root_width / DEFAULT_TK_WINDOW_SIZE_X
         self.factor_height = root_height / DEFAULT_TK_WINDOW_SIZE_Y
+        self.input_fits = input_fits
         self.auxdata = auxdata
-        if self.auxdata is not None:
-            # self.root.geometry("1000x760+100+100")  # This does not work in Fedora
+        self.naux = len(self.auxdata)
+        if self.naux > 0:
+            # self.root.geometry("1000x800+100+100")  # This does not work in Fedora
             window_width = int(1000 * self.factor_width + 0.5)
-            window_height = int(760 * self.factor_height + 0.5)
+            window_height = int(800 * self.factor_height + 0.5)
             self.root.minsize(window_width, window_height)
         else:
-            # self.root.geometry("900x760+100+100")  # This does not work in Fedora
-            window_width = int(900 * self.factor_width + 0.5)
-            window_height = int(760 * self.factor_height + 0.5)
+            # self.root.geometry("950x800+100+100")  # This does not work in Fedora
+            window_width = int(950 * self.factor_width + 0.5)
+            window_height = int(800 * self.factor_height + 0.5)
             self.root.minsize(window_width, window_height)
+        if len(auxfile_list) != self.naux:
+            raise ValueError("Length of auxfile_list must match length of auxdata.")
+        if len(extension_auxfile_list) != self.naux:
+            raise ValueError("Length of extension_auxfile_list must match length of auxdata.")
+        self.auxfile_list = auxfile_list
+        self.extension_auxfile_list = extension_auxfile_list
+        self.extension_auxfile_list = extension_auxfile_list
+        if self.naux == 0:
+            self.auxdata_options = []
+            self.auxiliary_data_index = None
+        else:
+            self.auxdata_options = [
+                f"#[{i+1}]: {os.path.basename(self.auxfile_list[i])}[{self.extension_auxfile_list[i]}]"
+                for i in range(self.naux)
+            ]
+            if self.naux > 1:
+                self.auxdata_options.extend(
+                    [
+                        f"#[{self.naux+1}]: MEAN of auxiliary data",
+                        f"#[{self.naux+2}]: MEDIAN of auxiliary data",
+                        f"#[{self.naux+3}]: MINIMUM of auxiliary data",
+                    ]
+                )
+        self.auxiliary_data_index = 0  # first auxiliary data by default
+        self.auxdata_mean = auxdata_mean
+        self.auxdata_median = auxdata_median
+        self.auxdata_min = auxdata_min
         self.root.update_idletasks()
         self.root.geometry("+100+100")
         self.data = data
@@ -247,6 +308,22 @@ class ReviewCosmicRay(ImageDisplay):
             self.create_widgets()
             center_on_parent(child=self.root, parent=self.root.master, offset_x=50, offset_y=50)
 
+    def on_combo_auxdata_select(self, event):
+        """Handle selection of auxiliary data from the combobox."""
+        selected_option = self.auxdata_var.get()
+        self.auxiliary_data_index = self.auxdata_options.index(selected_option) + 1
+        self.update_display()
+
+        # Return focus to the Matplotlib figure to keep keyboard shortcuts working
+        # (requires a tiny delay to avoid conflicts with the combobox event handling)
+        def give_focus_to_canvas():
+            self.canvas.get_tk_widget().focus_set()
+
+        if event is None:
+            self.root.after(10, give_focus_to_canvas)
+        else:
+            event.widget.after(10, give_focus_to_canvas)
+
     def create_widgets(self):
         """Create the GUI widgets for the review window."""
         # Define instance of TrackedTkButton, that facilitates to show help information
@@ -290,6 +367,15 @@ class ReviewCosmicRay(ImageDisplay):
         )
         self.restore_cr_button.pack(side=tk.LEFT, padx=5)
         self.restore_cr_button.config(state=tk.DISABLED)
+        # --- Fix CR button
+        self.fix_cr_button = tkbutton.new(
+            self.button_frame1,
+            text="[f]ix CR",
+            command=self.fix_cr_interpolation,
+            help_text="Fix current interpolation and allow new one.",
+        )
+        self.fix_cr_button.pack(side=tk.LEFT, padx=5)
+        self.fix_cr_button.config(state=tk.DISABLED)
         # --- Next button
         self.next_button = tkbutton.new(
             self.button_frame1,
@@ -403,24 +489,45 @@ class ReviewCosmicRay(ImageDisplay):
             help_text="Perform maskfill interpolation for the current cosmic ray.",
         )
         self.interp_maskfill_button.pack(side=tk.LEFT, padx=5)
+
+        # Row 4 of buttons
+        self.button_frame4 = tk.Frame(self.root)
+        self.button_frame4.pack(pady=5)
         # --- Interpolation using auxiliary data button
         self.interp_aux_button = tkbutton.new(
-            self.button_frame3,
+            self.button_frame4,
             text="[a]ux. data",
             command=self.use_auxdata,
             help_text="Use auxiliary data for interpolation of the current cosmic ray.",
         )
         self.interp_aux_button.pack(side=tk.LEFT, padx=5)
-        if self.auxdata is None:
+        if self.naux == 0:
             self.interp_aux_button.config(state=tk.DISABLED)
+        # --- Add combobox to choose auxdata if auxdata method is selected and naux > 0:
+        if self.naux == 0:
+            self.auxdata_var = tk.StringVar(value="No auxiliary data available")
+        else:
+            self.auxdata_var = tk.StringVar(value=self.auxdata_options[self.auxiliary_data_index])
+        self.auxdata_combobox = ttk.Combobox(
+            self.button_frame4,
+            textvariable=self.auxdata_var,
+            values=self.auxdata_options,
+            state="readonly",
+            width=40,
+        )
+        self.auxdata_combobox.pack(side=tk.LEFT, padx=5)
+        if self.naux == 0:
+            self.auxdata_combobox.config(state="disabled")
+        # --- Bind the selection event to the handler
+        self.auxdata_combobox.bind("<<ComboboxSelected>>", self.on_combo_auxdata_select)
 
-        # Row 4 of buttons
-        self.button_frame4 = tk.Frame(self.root)
-        self.button_frame4.pack(pady=5)
+        # Row 5 of buttons
+        self.button_frame5 = tk.Frame(self.root)
+        self.button_frame5.pack(pady=5)
         # --- vmin button
         vmin, vmax = zscale(self.data)
         self.vmin_button = tkbutton.new(
-            self.button_frame4,
+            self.button_frame5,
             text=f"vmin: {vmin:.2f}",
             command=self.set_vmin,
             help_text="Set the minimum value for the display scale.",
@@ -429,7 +536,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.vmin_button.pack(side=tk.LEFT, padx=5)
         # --- vmax button
         self.vmax_button = tkbutton.new(
-            self.button_frame4,
+            self.button_frame5,
             text=f"vmax: {vmax:.2f}",
             command=self.set_vmax,
             help_text="Set the maximum value for the display scale.",
@@ -438,7 +545,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.vmax_button.pack(side=tk.LEFT, padx=5)
         # --- minmax button
         self.set_minmax_button = tkbutton.new(
-            self.button_frame4,
+            self.button_frame5,
             text="minmax [,]",
             command=self.set_minmax,
             help_text="Set the display scale to the minimum and maximum data values.",
@@ -446,7 +553,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.set_minmax_button.pack(side=tk.LEFT, padx=5)
         # --- zscale button
         self.set_zscale_button = tkbutton.new(
-            self.button_frame4,
+            self.button_frame5,
             text="zscale [/]",
             command=self.set_zscale,
             help_text="Set the display scale using zscale.",
@@ -454,7 +561,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.set_zscale_button.pack(side=tk.LEFT, padx=5)
         # --- Help button
         self.help_button = tkbutton.new(
-            self.button_frame4,
+            self.button_frame5,
             text="Help",
             command=tkbutton.show_help,
             help_text="Show help information for all buttons.",
@@ -462,7 +569,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.help_button.pack(side=tk.LEFT, padx=5)
 
         # Figure
-        if self.auxdata is not None:
+        if self.naux > 0:
             self.fig, (self.ax, self.ax_aux) = plt.subplots(
                 ncols=2, figsize=(11 * self.factor_width, 5.5 * self.factor_height), constrained_layout=True
             )
@@ -546,12 +653,23 @@ class ReviewCosmicRay(ImageDisplay):
             vmax=vmax,
         )
         self.image.set_extent([jmin + 0.5, jmax + 1.5, imin + 0.5, imax + 1.5])
-        if self.auxdata is not None:
+        if self.naux > 0:
+            self.auxiliary_data_index = self.auxdata_options.index(self.auxdata_var.get()) + 1
+            if 1 <= self.auxiliary_data_index <= self.naux:
+                auximg = self.auxdata[self.auxiliary_data_index - 1]
+            elif self.auxiliary_data_index == self.naux + 1:
+                auximg = self.auxdata_mean
+            elif self.auxiliary_data_index == self.naux + 2:
+                auximg = self.auxdata_median
+            elif self.auxiliary_data_index == self.naux + 3:
+                auximg = self.auxdata_min
+            else:
+                raise ValueError(f"Invalid auxiliary data index: {self.auxiliary_data_index}")
             self.ax_aux.clear()
             self.image_aux, _, _ = imshow(
                 self.fig,
                 self.ax_aux,
-                self.auxdata[self.region],
+                auximg[self.region],
                 colorbar=False,
                 xlabel=xlabel,
                 ylabel=ylabel,
@@ -559,7 +677,10 @@ class ReviewCosmicRay(ImageDisplay):
                 vmax=vmax,
             )
             self.image_aux.set_extent([jmin + 0.5, jmax + 1.5, imin + 0.5, imax + 1.5])
-            self.ax_aux.set_title("Auxiliary data")
+            dumfname = self.auxdata_options[self.auxiliary_data_index - 1]
+            dumi = dumfname.find(":")
+            dumc = dumfname[:dumi].replace("[", "").replace("]", "")
+            self.ax_aux.set_title(f"Auxiliary data {dumc}:\n{dumfname[dumi+1:].strip()}")
         # Overplot cosmic ray pixels
         xlim = self.ax.get_xlim()
         ylim = self.ax.get_ylim()
@@ -576,7 +697,7 @@ class ReviewCosmicRay(ImageDisplay):
         if self.first_cr_index == 0:
             self.ax.set_title("Selecting CR pixels with mouse cursor")
         else:
-            self.ax.set_title(f"Cosmic ray #{self.cr_index}/{self.num_features}")
+            self.ax.set_title(f"Cosmic ray #{self.cr_index}/{self.num_features}\n{os.path.basename(self.input_fits)}")
         if self.first_plot:
             self.first_plot = False
         self.canvas.draw_idle()
@@ -654,6 +775,7 @@ class ReviewCosmicRay(ImageDisplay):
         """Set the state of buttons after cleaning a cosmic ray."""
         self.disable_interpolation_buttons()
         self.restore_cr_button.config(state=tk.NORMAL)
+        self.fix_cr_button.config(state=tk.NORMAL)
         self.remove_crosses_button.config(state=tk.DISABLED)
 
     def interp_x(self):
@@ -800,13 +922,25 @@ class ReviewCosmicRay(ImageDisplay):
 
     def use_auxdata(self):
         """Use auxiliary data to clean a cosmic ray."""
-        if self.auxdata is None:
+        if self.naux == 0:
             print("Auxiliary data not available.")
             return
         print(f"Auxiliary data interpolation of cosmic ray {self.cr_index}")
+        self.auxiliary_data_index = self.auxdata_options.index(self.auxdata_var.get()) + 1
+        print(f"Using auxiliary data: {self.auxdata_options[self.auxiliary_data_index-1]}")
         ycr_list, xcr_list = np.where(self.cr_labels == self.cr_index)
+        if 1 <= self.auxiliary_data_index <= self.naux:
+            replacement_data = self.auxdata[self.auxiliary_data_index - 1]
+        elif self.auxiliary_data_index == self.naux + 1:
+            replacement_data = self.auxdata_mean
+        elif self.auxiliary_data_index == self.naux + 2:
+            replacement_data = self.auxdata_median
+        elif self.auxiliary_data_index == self.naux + 3:
+            replacement_data = self.auxdata_min
+        else:
+            raise ValueError(f"Invalid auxiliary data index: {self.auxiliary_data_index}.")
         for iy, ix in zip(ycr_list, xcr_list):
-            self.data[iy, ix] = self.auxdata[iy, ix]
+            self.data[iy, ix] = replacement_data[iy, ix]
             self.mask_fixed[iy, ix] = True
         self.num_cr_cleaned += 1
         self.set_buttons_after_cleaning_cr()
@@ -835,6 +969,17 @@ class ReviewCosmicRay(ImageDisplay):
         self.enable_interpolation_buttons()
         self.remove_crosses_button.config(state=tk.NORMAL)
         self.restore_cr_button.config(state=tk.DISABLED)
+        self.fix_cr_button.config(state=tk.DISABLED)
+        self.update_display()
+
+    def fix_cr_interpolation(self):
+        """Fix the current interpolation and allow new one."""
+        print(f"Fixed interpolation for cosmic ray {self.cr_index}")
+        ycr_list, xcr_list = np.where(self.cr_labels == self.cr_index)
+        for iy, ix in zip(ycr_list, xcr_list):
+            self.cr_labels[iy, ix] = 0
+        self.restore_cr_button.config(state=tk.DISABLED)
+        self.fix_cr_button.config(state=tk.DISABLED)
         self.update_display()
 
     def continue_cr(self):
@@ -848,6 +993,7 @@ class ReviewCosmicRay(ImageDisplay):
             return  # important: do not remove (to avoid errors)
         self.first_plot = True
         self.restore_cr_button.config(state=tk.DISABLED)
+        self.fix_cr_button.config(state=tk.DISABLED)
         self.enable_interpolation_buttons()
         self.remove_crosses_button.config(state=tk.NORMAL)
         self.update_display()
@@ -863,6 +1009,9 @@ class ReviewCosmicRay(ImageDisplay):
         elif event.key == "r":
             if self.restore_cr_button.cget("state") != "disabled":
                 self.restore_cr()
+        elif event.key == "f":
+            if self.fix_cr_button.cget("state") != "disabled":
+                self.fix_cr_interpolation()
         elif event.key == "x":
             if self.interp_x_button.cget("state") != "disabled":
                 self.interp_x()
@@ -896,6 +1045,12 @@ class ReviewCosmicRay(ImageDisplay):
         elif event.key == "e":
             self.exit_review()
             return  # important: do not remove (to avoid errors)
+        elif event.key in ["1", "2", "3", "4", "5", "6", "7", "8", "9"]:
+            if self.naux > 1 and int(event.key) <= self.naux + 3:
+                index = int(event.key) - 1
+                if 0 <= index < len(self.auxdata_options):
+                    self.auxdata_var.set(self.auxdata_options[index])
+                    self.on_combo_auxdata_select(None)
         else:
             print(f"Key pressed: {event.key}")
 
@@ -933,6 +1088,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.interp_deepcr_button.config(state=tk.DISABLED)
         self.interp_maskfill_button.config(state=tk.DISABLED)
         self.interp_aux_button.config(state=tk.DISABLED)
+        self.auxdata_combobox.config(state=tk.DISABLED)
 
     def enable_interpolation_buttons(self):
         """Enable all interpolation buttons."""
@@ -949,5 +1105,6 @@ class ReviewCosmicRay(ImageDisplay):
         if self.cleandata_deepcr is not None:
             self.interp_deepcr_button.config(state=tk.NORMAL)
         self.interp_maskfill_button.config(state=tk.NORMAL)
-        if self.auxdata is not None:
+        if self.naux > 0:
             self.interp_aux_button.config(state=tk.NORMAL)
+            self.auxdata_combobox.config(state="readonly")

teareduce/simulateccdexposure.py

@@ -194,7 +194,7 @@ class SimulateCCDExposure:
 
     CCD exposures are simulated making use of basic CCD parameters,
     such as gain, readout noise, bias, dark and flat field.
-    A data model can also be employed to simulate more realising
+    A data model can also be employed to simulate more realistic
     CCD exposures.
 
     The saturated pixels in 'data_model' are returned as 2**bitpix - 1
@@ -230,6 +230,8 @@ class SimulateCCDExposure:
         Numpy array with the pixel to pixel sensitivity (without units).
     data_model : Quantity
         Numpy array with the model of the source to be simulated (ADU).
+        Note that this is the model before applying the flatfield.
+        The values in this array must be the total ADU for each pixel.
     seed : int or None
         Random number generator seed.
     _rng : np.random.RandomState

teareduce/version.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2023-2025 Universidad Complutense de Madrid
+# Copyright 2023-2026 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -9,7 +9,7 @@
 #
 """Module to define the version of the teareduce package."""
 
-VERSION = '0.6.8'
+VERSION = '0.7.0'
 
 
 def main():

{teareduce-0.6.8.dist-info → teareduce-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.6.8
+Version: 0.7.0
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later