teareduce 0.6.8__tar.gz → 0.7.0__tar.gz

{teareduce-0.6.8/src/teareduce.egg-info → teareduce-0.7.0}/PKG-INFO

@@ -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

{teareduce-0.6.8 → teareduce-0.7.0}/src/teareduce/cleanest/__main__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2025 Universidad Complutense de Madrid
+# Copyright 2025-2026 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -10,11 +10,10 @@
 """Interactive Cosmic Ray cleaning tool."""
 
 import argparse
+import glob
 import tkinter as tk
 from tkinter import filedialog
-from tkinter import simpledialog
 import os
-from pathlib import Path
 import platform
 from rich import print
 from rich_argparse import RichHelpFormatter
@@ -38,14 +37,7 @@ def main():
         formatter_class=RichHelpFormatter,
     )
     parser.add_argument("input_fits", nargs="?", default=None, help="Path to the FITS file to be cleaned.")
-    parser.add_argument("--extension", type=str, default="0", help="FITS extension to use (default: 0).")
-    parser.add_argument("--auxfile", type=str, default=None, help="Auxiliary FITS file")
-    parser.add_argument(
-        "--extension_auxfile",
-        type=str,
-        default="0",
-        help="FITS extension for auxiliary file (default: 0).",
-    )
+    parser.add_argument("--auxfile", type=str, default=None, help="Auxiliary FITS files (comma-separated if several).")
     parser.add_argument(
         "--fontfamily",
         type=str,
@@ -114,17 +106,77 @@ def main():
             use_auxfile = True
         if use_auxfile:
             print(f"Selected auxiliary FITS file: {args.auxfile}")
-            args.extension_auxfile = ask_extension_input_image(args.auxfile, imgshape=None)
+            extension_auxfile = ask_extension_input_image(args.auxfile, imgshape=None)
+            args.auxfile = f"{args.auxfile}[{extension_auxfile}]"
+        else:
+            args.auxfile = None
         root.destroy()
 
-    # Check that input files, and the corresponding extensions, exist
-    if not os.path.isfile(args.input_fits):
-        print(f"Error: File '{args.input_fits}' does not exist.")
-        exit(1)
-    if args.auxfile is not None and not os.path.isfile(args.auxfile):
-        print(f"Error: Auxiliary file '{args.auxfile}' does not exist.")
+    # Check that input file exists
+    if "[" in args.input_fits:
+        input_fits = args.input_fits[: args.input_fits.index("[")]
+        extension = args.input_fits[args.input_fits.index("[") + 1 : args.input_fits.index("]")]
+    else:
+        input_fits = args.input_fits
+        extension = "0"
+    if not os.path.isfile(input_fits):
+        print(f"Error: File '{input_fits}' does not exist.")
         exit(1)
 
+    # Process auxiliary files if provided
+    auxfile_list = []
+    extension_auxfile_list = []
+    if args.auxfile is not None:
+        # Check several auxiliary files separated by commas
+        if "\n" in args.auxfile:
+            if "?" in args.auxfile or "*" in args.auxfile:
+                print("Error: Cannot combine newlines and wildcards in --auxfile specification.")
+                exit(1)
+            # Replace newlines by commas to allow:
+            # --auxfile="`ls file??.fits`"   -> without extensions
+            # --auxfile="`for f in file??.fits; do echo "${f}[primary]"; done`"  -> with extension name (the same for all files!)
+            args.auxfile = args.auxfile.replace("\n", ",")
+        elif "?" in args.auxfile or "*" in args.auxfile:
+            # Handle wildcards to allow:
+            # --auxfile="file??.fits"   -> without extensions
+            # --auxfile="file??.fits[primary]"  -> with extension name (the same for all files!)
+            if "," in args.auxfile:
+                print("Error: Cannot combine wildcards with commas in --auxfile specification.")
+                exit(1)
+            # Expand possible wildcards in the auxiliary file specification
+            if "[" in args.auxfile:
+                s = args.auxfile.strip()
+                ext = None
+                if s.endswith("]"):
+                    ext = s[s.rfind("[") + 1 : s.rfind("]")]
+                    s = s[: s.rfind("[")]
+                matched_files = sorted(glob.glob(s))
+                if len(matched_files) == 0:
+                    print(f"Error: No files matched the pattern '{s}'.")
+                    exit(1)
+                args.auxfile = ",".join([f"{fname}[{ext}]" if ext is not None else fname for fname in matched_files])
+            else:
+                matched_files = sorted(glob.glob(args.auxfile))
+                if len(matched_files) == 0:
+                    print(f"Error: No files matched the pattern '{args.auxfile}'.")
+                    exit(1)
+                args.auxfile = ",".join(matched_files)
+        # Now process the comma-separated auxiliary files
+        for item in args.auxfile.split(","):
+            # Extract possible [ext] from filename
+            if "[" in item:
+                # Separate filename and extension, removing blanks
+                fname = item[: item.index("[")].strip()
+                # Check that file exists
+                if not os.path.isfile(fname):
+                    print(f"Error: File '{fname}' does not exist.")
+                    exit(1)
+                auxfile_list.append(fname)
+                extension_auxfile_list.append(item[item.index("[") + 1 : item.index("]")])
+            else:
+                auxfile_list.append(item.strip())
+                extension_auxfile_list.append("0")
+
     # Initialize Tkinter root
     try:
         root = tk.Tk()
@@ -149,10 +201,10 @@ def main():
     # Create and run the application
     CosmicRayCleanerApp(
         root=root,
-        input_fits=args.input_fits,
-        extension=args.extension,
-        auxfile=args.auxfile,
-        extension_auxfile=args.extension_auxfile,
+        input_fits=input_fits,
+        extension=extension,
+        auxfile_list=auxfile_list,
+        extension_auxfile_list=extension_auxfile_list,
         fontfamily=args.fontfamily,
         fontsize=args.fontsize,
         width=args.width,

teareduce-0.7.0/src/teareduce/cleanest/choose_index_with_three_buttons.py

@@ -0,0 +1,126 @@
+#
+# Copyright 2026 Universidad Complutense de Madrid
+#
+# This file is part of teareduce
+#
+# SPDX-License-Identifier: GPL-3.0+
+# License-Filename: LICENSE.txt
+#
+
+import tkinter as tk
+from tkinter import simpledialog, ttk
+
+
+class ThreeButtonListDialog(simpledialog.Dialog):
+    """
+    A modal dialog that shows a list of strings and returns:
+      - 1..N : the highlighted item index (1-based) when pressing OK (or double-click / Enter)
+      - 0    : when pressing Cancel or closing the window (Esc or window X)
+      - N+1  : when pressing New (N = len(items))
+    """
+
+    def __init__(self, parent, title, prompt, items):
+        self.prompt = prompt
+        self.items = list(items)
+        self.result = None
+        self._force_new = False  # used to bypass selection validation for "New"
+        super().__init__(parent, title)
+
+    # ---------- Core layout ----------
+    def body(self, master):
+        ttk.Label(master, text=self.prompt).grid(row=0, column=0, columnspan=1, sticky="w", padx=8, pady=(8, 4))
+
+        self.listbox = tk.Listbox(master, height=min(12, max(4, len(self.items))), activestyle="dotbox")
+        for s in self.items:
+            self.listbox.insert(tk.END, s)
+        self.listbox.grid(row=1, column=0, sticky="nsew", padx=(8, 0), pady=4)
+
+        scrollbar = ttk.Scrollbar(master, orient="vertical", command=self.listbox.yview)
+        self.listbox.configure(yscrollcommand=scrollbar.set)
+        scrollbar.grid(row=1, column=1, sticky="ns", pady=4, padx=(0, 8))
+
+        # Keyboard bindings
+        self.listbox.bind("<Double-Button-1>", lambda e: self.ok())  # OK on double-click
+        self.bind("<Return>", lambda e: self.ok())  # Enter = OK
+        self.bind("<Escape>", lambda e: self.cancel())  # Esc = Cancel (→ 0)
+
+        # Resize behavior
+        master.grid_columnconfigure(0, weight=1)
+        master.grid_rowconfigure(1, weight=1)
+
+        if self.items:
+            self.listbox.selection_set(0)
+            self.listbox.activate(0)
+
+        return self.listbox  # initial focus on listbox
+
+    # ---------- Buttons (OK, Cancel, New) ----------
+    def buttonbox(self):
+        box = ttk.Frame(self)
+
+        self.ok_button = ttk.Button(box, text="OK", width=10, command=self.ok)
+        self.ok_button.grid(row=0, column=0, padx=5, pady=8)
+
+        self.cancel_button = ttk.Button(box, text="Cancel", width=10, command=self.cancel)
+        self.cancel_button.grid(row=0, column=1, padx=5, pady=8)
+
+        self.new_button = ttk.Button(box, text="New", width=10, command=self._on_new)
+        self.new_button.grid(row=0, column=2, padx=5, pady=8)
+
+        # Bindings for Return/Escape already set in body()
+        self.bind("<Return>", lambda e: self.ok())
+        self.bind("<Escape>", lambda e: self.cancel())
+
+        box.pack(side="bottom", fill="x")
+
+    # ---------- Dialog flow ----------
+    def validate(self):
+        """
+        Called by OK to decide whether dialog can close.
+        - If 'New' was pressed, allow closing without selection.
+        - Otherwise, ensure there is a highlighted item.
+        """
+        if self._force_new:
+            return True
+        cur = self.listbox.curselection()
+        if not cur:
+            self.bell()
+            return False
+        self._selected_index = cur[0]
+        return True
+
+    def apply(self):
+        """
+        Called after validate(). Set the final result here.
+        """
+        if self._force_new:
+            self.result = len(self.items) + 1  # N+1 (New)
+        else:
+            self.result = self._selected_index + 1  # 1..N (index of selection)
+
+    def _on_new(self):
+        """
+        Trigger New: returns N+1.
+        This must bypass selection validation.
+        """
+        self._force_new = True
+        self.ok()
+
+    # Important: Don't overwrite OK/New results when closing via Dialog.ok().
+    # Dialog.ok() calls validate() -> apply() -> cancel().
+    # Only set 0 in cancel() if result wasn't already set.
+    def cancel(self, event=None):
+        if self.result is None:
+            self.result = 0
+        super().cancel(event)
+
+
+def choose_index_with_three_buttons(parent, title, prompt, items):
+    """
+    Show the dialog and return:
+      - 1..N : highlighted item index (OK)
+      - 0    : Cancel/close
+      - N+1  : New
+    """
+    dlg = ThreeButtonListDialog(parent, title, prompt, items)
+    return dlg.result