setiastrosuitepro 1.8.2__py3-none-any.whl → 1.8.3__py3-none-any.whl

setiastro/saspro/_generated/build_info.py

@@ -1,3 +1,3 @@
 # Auto-generated at build time. Do not edit.
-BUILD_TIMESTAMP = "2026-01-29T01:10:38Z"
-APP_VERSION = "1.8.2"
+BUILD_TIMESTAMP = "2026-01-29T18:14:59Z"
+APP_VERSION = "1.8.3"

setiastro/saspro/backgroundneutral.py

@@ -168,40 +168,78 @@ def _find_best_patch_center(lum: np.ndarray) -> tuple[int, int]:
     return best_pt
 
 
-def auto_rect_50x50(img_rgb: np.ndarray) -> tuple[int, int, int, int]:
+
+def auto_rect_box(img_rgb: np.ndarray, box: int = 50, margin: int = 100) -> tuple[int, int, int, int]:
     """
-    Find a robust 50×50 background rectangle (≥100 px margins) in image space.
+    Find a robust box×box background rectangle (>= margin px margins) in image space.
     Returns (x, y, w, h).
+
+    Notes:
+      - img_rgb must be HxWx3 float/uint in any range (we only use relative luminance).
+      - box is clamped so it always fits within the image + margins.
     """
-    h, w, ch = img_rgb.shape
-    if ch != 3:
+    if img_rgb.ndim != 3 or img_rgb.shape[2] != 3:
         raise ValueError("Auto background finder expects a 3-channel RGB image.")
-    lum = img_rgb.mean(axis=2).astype(np.float32)
 
+    H, W, _ = img_rgb.shape
+    box = int(box)
+
+    # Clamp box so it fits inside the image after margins.
+    # Ensure at least 10px and at least 1px interior.
+    max_box_w = max(10, W - 2 * margin - 2)
+    max_box_h = max(10, H - 2 * margin - 2)
+    max_box = max(10, min(max_box_w, max_box_h))
+    box = int(np.clip(box, 10, max_box))
+
+    half = box // 2
+
+    # Luminance proxy
+    lum = img_rgb.mean(axis=2).astype(np.float32, copy=False)
+
+    # Your existing routine (assumed to return (cy, cx) in image coords)
     cy, cx = _find_best_patch_center(lum)
 
-    margin = 100
-    half = 25
-    min_cx, max_cx = margin + half, w - (margin + half)
-    min_cy, max_cy = margin + half, h - (margin + half)
+    # Keep center far enough from edges so the full box fits
+    min_cx, max_cx = margin + half, W - (margin + half)
+    min_cy, max_cy = margin + half, H - (margin + half)
     cx = int(np.clip(cx, min_cx, max_cx))
     cy = int(np.clip(cy, min_cy, max_cy))
 
-    # refine by ±half
+    # Refine around the center.
+    # Step scales with box so the search is meaningful at different sizes.
+    step = max(4, half // 2)  # e.g. 50->12, 80->20, 30->7
     best_val = np.inf
     ty, tx = cy, cx
-    for dy in (-half, 0, +half):
-        for dx in (-half, 0, +half):
+
+    for dy in (-step, 0, +step):
+        for dx in (-step, 0, +step):
             y = int(np.clip(cy + dy, min_cy, max_cy))
             x = int(np.clip(cx + dx, min_cx, max_cx))
-            y0, y1 = y - half, y + half
-            x0, x1 = x - half, x + half
-            m = np.median(lum[y0:y1, x0:x1])
+            y0, y1 = y - half, y - half + box
+            x0, x1 = x - half, x - half + box
+
+            # Safety (should already be safe due to clamping, but keep it robust)
+            if y0 < 0 or x0 < 0 or y1 > H or x1 > W:
+                continue
+
+            m = float(np.median(lum[y0:y1, x0:x1]))
             if m < best_val:
                 best_val, ty, tx = m, y, x
 
-    return (tx - half, ty - half, 50, 50)
+    # Top-left anchored rect, exact box size
+    x0 = int(tx - half)
+    y0 = int(ty - half)
+
+    # Final clamp (again, belt + suspenders)
+    x0 = int(np.clip(x0, margin, W - margin - box))
+    y0 = int(np.clip(y0, margin, H - margin - box))
 
+    return (x0, y0, box, box)
+
+
+def auto_rect_50x50(img_rgb: np.ndarray) -> tuple[int, int, int, int]:
+    """Backward-compatible wrapper."""
+    return auto_rect_box(img_rgb, box=50, margin=100)
 
 # --------------------------------
 # Headless apply (doc + preset in)

setiastro/saspro/finder_chart.py

@@ -658,16 +658,26 @@ def _place_label_inside(ax, x, y, text, *, dx=6, dy=4, fontsize=9,
 
     return t
 
+SURVEY_HIPS = {
+    # Optical
+    "DSS2 (Color)": "CDS/P/DSS2/color",
+    "DSS2 (Red)":   "CDS/P/DSS2/red",
+    "DSS2 (Blue)":  "CDS/P/DSS2/blue",
+    "DSS2 (IR)":    "CDS/P/DSS2/IR",
+    "Pan-STARRS DR1 (Color)": "CDS/P/PanSTARRS/DR1/color",
+    "SDSS9 (Color Alt)":      "CDS/P/SDSS9/color-alt",
+    "DESI Legacy DR10 (Color)": "CDS/P/DESI-Legacy-Surveys/DR10/color",
+
+    # Infrared
+    "2MASS (J)": "CDS/P/2MASS/J",
+    "2MASS (H)": "CDS/P/2MASS/H",
+
+    # Gaia
+    "Gaia DR3 (Flux Color)": "CDS/P/Gaia/DR3/flux-color",
+}
 
 def _survey_to_hips_id(label: str) -> str:
-    key = (label or "").strip().lower()
-    if "dss" in key:
-        return "CDS/P/DSS2/color"
-    if "pan" in key:
-        return "CDS/P/PanSTARRS/DR1/color"
-    if "gaia" in key:
-        return "CDS/P/Gaia/DR3/flux-color"
-    return "CDS/P/DSS2/color"
+    return SURVEY_HIPS.get(label, "CDS/P/DSS2/color")
 
 def try_fetch_hips_cutout(center: "SkyCoord", fov_deg: float, out_px: int, survey_label: str):
     """
@@ -1149,7 +1159,8 @@ class FinderChartDialog(QDialog):
 
         row1.addWidget(QLabel("Survey:"))
         self.cmb_survey = QComboBox()
-        self.cmb_survey.addItems(["DSS2", "Pan-STARRS", "Gaia"])
+        self.cmb_survey.clear()
+        self.cmb_survey.addItems(list(SURVEY_HIPS.keys()))
         row1.addWidget(self.cmb_survey)
 
         row1.addSpacing(12)

setiastro/saspro/gui/main_window.py

@@ -186,7 +186,7 @@ from setiastro.saspro.resources import (
     colorwheel_path, font_path, csv_icon_path, spinner_path, wims_path, narrowbandnormalization_path,
     wimi_path, linearfit_path, debayer_path, aberration_path, acv_icon_path,
     functionbundles_path, viewbundles_path, selectivecolor_path, rgbalign_path, planetarystacker_path,
-    background_path, script_icon_path, planetprojection_path,clonestampicon_path, finderchart_path,
+    background_path, script_icon_path, planetprojection_path,clonestampicon_path, finderchart_path,magnitude_path,
 )
 
 import faulthandler
@@ -3185,6 +3185,45 @@ class AstroSuiteProMainWindow(
             pass
         self.SFCC_window.show()
 
+    def _open_magnitude_tool(self):
+        import os
+        from PyQt6.QtGui import QIcon
+        from PyQt6.QtWidgets import QMessageBox
+
+        # Keep same window-singleton behavior as SFCC
+        if getattr(self, "MAG_window", None) and self.MAG_window.isVisible():
+            self.MAG_window.raise_()
+            self.MAG_window.activateWindow()
+            return
+
+        # ensure we have a DocManager (mirror SFCC pattern)
+        from setiastro.saspro.doc_manager import DocManager
+        if not hasattr(self, "doc_manager") or self.doc_manager is None:
+            self.doc_manager = DocManager(image_manager=getattr(self, "image_manager", None), parent=self)
+
+        # import tool
+        from setiastro.saspro.magnitude_tool import MagnitudeToolDialog
+
+        self.MAG_window = MagnitudeToolDialog(
+            doc_manager=self.doc_manager,
+            parent=self
+        )
+
+        # optional icon
+        try:
+            self.MAG_window.setWindowIcon(QIcon(magnitude_path))
+        except Exception:
+            pass
+
+        # cleanup
+        try:
+            self.MAG_window.destroyed.connect(lambda _=None: setattr(self, "MAG_window", None))
+        except Exception:
+            pass
+
+        self.MAG_window.show()
+
+
     def show_convo_deconvo(self, doc=None):
         # Reuse existing dialog if it's already open
         sw = self.mdi.activeSubWindow()
@@ -3496,13 +3535,53 @@ class AstroSuiteProMainWindow(
         base = base_title or (getattr(doc, "display_name", lambda: None)() or "RGB")
 
         def _open(arr, suffix):
-            meta = {
+            from astropy.io import fits
+
+            # ---- 1) start from source metadata (preserve headers/WCS) ----
+            src_meta = getattr(doc, "metadata", {}) or {}
+            meta = dict(src_meta)  # shallow copy of top-level dict
+
+            # Preserve header objects safely
+            fits_hdr = src_meta.get("fits_header")
+            wcs_hdr  = src_meta.get("wcs_header")
+            orig_hdr = src_meta.get("original_header")
+
+            # Keep them if they are astropy Headers; otherwise fall back gracefully
+            meta["fits_header"] = fits_hdr.copy() if isinstance(fits_hdr, fits.Header) else fits_hdr
+            meta["wcs_header"]  = wcs_hdr.copy()  if isinstance(wcs_hdr,  fits.Header) else wcs_hdr
+            meta["original_header"] = orig_hdr.copy() if isinstance(orig_hdr, fits.Header) else orig_hdr
+
+            # Preserve WCS object + flags (ok if None)
+            if "wcs" in src_meta:
+                meta["wcs"] = src_meta.get("wcs")
+            if "HasAstrometricSolution" in src_meta:
+                meta["HasAstrometricSolution"] = src_meta.get("HasAstrometricSolution")
+
+            # Preserve image_meta mirror, but make it a copy so we don't mutate parent
+            im = src_meta.get("image_meta")
+            if isinstance(im, dict):
+                meta["image_meta"] = dict(im)
+
+            # ---- 2) overwrite/extend with RGB-extract specific fields ----
+            base = base_title or (getattr(doc, "display_name", lambda: None)() or "RGB")
+            title = f"{base}_{suffix}"
+            try:
+                fh = meta.get("fits_header")
+                if isinstance(fh, fits.Header):
+                    fh["NAXIS"] = 2
+                    if "NAXIS3" in fh:
+                        del fh["NAXIS3"]
+            except Exception:
+                pass
+            meta.update({
                 "source": "RGB Extract",
                 "is_mono": True,
                 "bit_depth": "32-bit floating point",
                 "parent_title": base,
-            }
-            title = f"{base}_{suffix}"
+                "channel": suffix,   # handy for later
+            })
+
+            # ---- 3) create doc ----
             try:
                 if hasattr(dm, "open_array"):
                     newdoc = dm.open_array(arr, metadata=meta, title=title)
@@ -3510,10 +3589,23 @@ class AstroSuiteProMainWindow(
                     newdoc = dm.open_numpy(arr, metadata=meta, title=title)
                 else:
                     newdoc = dm.create_document(image=arr, metadata=meta, name=title)
+
+                # ---- 4) ensure WCS is internally consistent on the new doc ----
+                # If source had a WCS solution, rebuild original_header+wcs using your canonical path.
+                try:
+                    if meta.get("HasAstrometricSolution") or (meta.get("wcs_header") is not None):
+                        wcs_dict = self._extract_wcs_dict(doc)  # from SOURCE doc
+                        if wcs_dict:
+                            self._apply_wcs_dict_to_doc(newdoc, dict(wcs_dict))
+                except Exception:
+                    pass
+
                 self._spawn_subwindow_for(newdoc)
+
             except Exception as ex:
                 QMessageBox.critical(self, "RGB Extract", f"Failed to open '{title}':\n{ex}")
 
+
         _open(r, "R")
         _open(g, "G")
         _open(b, "B")

setiastro/saspro/gui/mixins/header_mixin.py

@@ -36,16 +36,31 @@ class HeaderMixin:
     }
 
     def _ensure_header_map(self, doc):
-        """Ensure doc has a header dictionary in metadata, return it."""
+        """Ensure doc has an original_header container; preserve fits.Header if present."""
         meta = getattr(doc, "metadata", None)
         if meta is None:
             return None
+
         hdr = meta.get("original_header")
-        if not isinstance(hdr, dict):
-            hdr = {}
-            meta["original_header"] = hdr
+
+        # Preserve astropy Header
+        try:
+            from astropy.io.fits import Header
+            if isinstance(hdr, Header):
+                return hdr
+        except Exception:
+            pass
+
+        # Preserve dict
+        if isinstance(hdr, dict):
+            return hdr
+
+        # If missing/unknown, create dict (but do NOT overwrite a valid Header above)
+        hdr = {}
+        meta["original_header"] = hdr
         return hdr
 
+
     def _coerce_wcs_numbers(self, d: dict) -> dict:
         """Convert common WCS/SIP values to int/float where appropriate."""
         numeric = {
@@ -72,23 +87,33 @@ class HeaderMixin:
         return out
 
     def _extract_wcs_dict(self, doc) -> dict:
-        """Collect a complete WCS/SIP dict from the doc's header/meta."""
         if doc is None:
             return {}
-        src = (getattr(doc, "metadata", {}) or {}).get("original_header")
 
-        wcs = {}
-        if src is None:
+        meta = getattr(doc, "metadata", {}) or {}
+
+        # 0) Preferred: astropy WCS object in metadata
+        w = meta.get("wcs", None)
+        try:
+            from astropy.wcs import WCS as _AstroWCS
+            if isinstance(w, _AstroWCS):
+                h = w.to_header(relax=True)
+                return self._coerce_wcs_numbers({k.upper(): h[k] for k in h.keys()})
+        except Exception:
             pass
-        else:
+
+        src = meta.get("original_header")
+
+        wcs = {}
+        src = meta.get("original_header")
+        if src is not None:
             try:
-                for k, v in dict(src).items():
+                # fits.Header has .keys()
+                items = src.items() if hasattr(src, "items") else dict(src).items()
+                for k, v in items:
                     K = str(k).upper()
-                    if (K.startswith(("CRPIX", "CRVAL", "CDELT", "CD", "PC", "CROTA", "CTYPE", "CUNIT",
-                                      "WCSAXES", "LONPOLE", "LATPOLE", "EQUINOX", "PV")) or
-                        K in {"RADECSYS", "RADESYS", "NAXIS1", "NAXIS2"} or
-                        K.startswith(("A_", "B_", "AP_", "BP_"))):
-                        wcs[K] = v
+                    ...
+                    wcs[K] = v
             except Exception:
                 pass
 

setiastro/saspro/gui/mixins/menu_mixin.py

@@ -181,6 +181,7 @@ class MenuMixin:
         m_tools.addAction(self.act_ppp)
         
         m_tools.addAction(self.act_selective_color)
+        m_tools.addAction(self.act_magnitude)
         m_tools.addSeparator()
         m_tools.addAction(self.act_view_bundles) 
         m_tools.addAction(self.act_function_bundles)

setiastro/saspro/gui/mixins/toolbar_mixin.py

@@ -36,7 +36,7 @@ from setiastro.saspro.resources import (
     nbtorgb_path, freqsep_path, multiscale_decomp_path, contsub_path, halo_path, cosmic_path,
     satellite_path, imagecombine_path, wims_path, wimi_path, linearfit_path,
     debayer_path, aberration_path, functionbundles_path, viewbundles_path, planetarystacker_path,
-    selectivecolor_path, rgbalign_path, planetprojection_path, clonestampicon_path, finderchart_path,
+    selectivecolor_path, rgbalign_path, planetprojection_path, clonestampicon_path, finderchart_path,magnitude_path,
 )
 
 # Import shortcuts module
@@ -254,6 +254,7 @@ class ToolbarMixin:
         tb_tl.addAction(self.act_multiscale_decomp)
         tb_tl.addAction(self.act_contsub)
         tb_tl.addAction(self.act_image_combine)
+        tb_tl.addAction(self.act_magnitude)
 
         self._restore_toolbar_order(tb_tl, "Toolbar/Tools")
         try:
@@ -1149,6 +1150,11 @@ class ToolbarMixin:
         self.act_selective_color.setStatusTip(self.tr("Adjust specific hue ranges with CMY/RGB controls"))
         self.act_selective_color.triggered.connect(self._open_selective_color_tool)
 
+        self.act_magnitude = QAction(QIcon(magnitude_path), self.tr("Magnitude / Surface Brightness..."), self)
+        self.act_magnitude.setStatusTip(self.tr("Measure magnitude and mag/arcsec² from the active linear view"))
+        self.act_magnitude.setIconVisibleInMenu(True)
+        self.act_magnitude.triggered.connect(self._open_magnitude_tool)
+
         # NEW: Frequency Separation
         self.act_freqsep = QAction(QIcon(freqsep_path), self.tr("Frequency Separation..."), self)
         self.act_freqsep.setStatusTip(self.tr("Split into LF/HF and enhance HF (scale, wavelet, denoise)"))
@@ -1441,6 +1447,7 @@ class ToolbarMixin:
         reg("image_combine", self.act_image_combine)   
         reg("psf_viewer", self.act_psf_viewer)
         reg("plate_solve", self.act_plate_solve)
+        reg("magnitude_tool", self.act_magnitude)
         reg("star_align", self.act_star_align)
         reg("star_register", self.act_star_register)
         reg("mosaic_master", self.act_mosaic_master)

setiastro/saspro/imageops/stretch.py

@@ -1,4 +1,4 @@
-# imageops/stretch.py
+# src/setiastro/saspro/imageops/stretch.py
 from __future__ import annotations
 import numpy as np