sed-model 0.3.1__tar.gz → 0.3.2__tar.gz

{sed_model-0.3.1 → sed_model-0.3.2}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.3.2] — 2026-10-25
+
+- **Filter files from SED_Tools 0.4.0 load again.** SED_Tools 0.4.0 puts its
+  metadata on the column row (`Wavelength,Transmission,FilterID=...;DetectorType=...`);
+  the loader now reads only the first two columns instead of failing with
+  `expected two-column file`. Required for SED_Tools >= 0.4.0 filter files.
+  The metadata itself is not read yet.
+- Tests find their data in `~/.sed_tools/data` as well as the older locations
+  and `$MESA_DIR/data/colors_data`.
+
 ## [0.3.1] — 2026-10-23
 
 Packaging and CI only; no numerical changes.

{sed_model-0.3.1 → sed_model-0.3.2}/CITATION.cff

@@ -7,7 +7,7 @@ authors:
   - family-names: "Miller"
     given-names: "Niall"
     email: "niall.j.miller@gmail.com"
-version: "0.3.1"
+version: "0.3.2"
 repository-code: "https://github.com/nialljmiller/SED_Model"
 url: "https://nialljmiller.github.io/SED_Model/"
 license: MIT

{sed_model-0.3.1 → sed_model-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sed-model
-Version: 0.3.1
+Version: 0.3.2
 Summary: Forward and inverse stellar photometry from SED grids.
 Keywords: astronomy,astrophysics,stellar astronomy,synthetic photometry,spectral energy distributions,sed,stellar parameters,bayesian inference,mcmc
 Author-Email: Niall Miller <niall.j.miller@gmail.com>
@@ -36,7 +36,7 @@ Description-Content-Type: text/markdown
 
 SED_Model is a Python package for computing observer-ready synthetic spectral energy distributions (SEDs) and broadband magnitudes from stellar atmosphere grids, and for recovering stellar parameters from observed photometry via Bayesian MCMC inference. It is designed to work directly downstream of `SED_Tools` and as a standalone drop-in for workflows that use MESA-style atmosphere grids and filter transmission curves.
 
-Version: `0.3.1`
+Version: `0.3.2`
 
 **Documentation:** https://nialljmiller.github.io/SED_Model/
 

{sed_model-0.3.1 → sed_model-0.3.2}/README.md

@@ -8,7 +8,7 @@
 
 SED_Model is a Python package for computing observer-ready synthetic spectral energy distributions (SEDs) and broadband magnitudes from stellar atmosphere grids, and for recovering stellar parameters from observed photometry via Bayesian MCMC inference. It is designed to work directly downstream of `SED_Tools` and as a standalone drop-in for workflows that use MESA-style atmosphere grids and filter transmission curves.
 
-Version: `0.3.1`
+Version: `0.3.2`
 
 **Documentation:** https://nialljmiller.github.io/SED_Model/
 

{sed_model-0.3.1 → sed_model-0.3.2}/docs/index.md

@@ -8,7 +8,7 @@
 
 SED_Model is a Python package for computing observer-ready synthetic spectral energy distributions (SEDs) and broadband magnitudes from stellar atmosphere grids, and for recovering stellar parameters from observed photometry via Bayesian MCMC inference. It works directly downstream of [SED_Tools](https://github.com/nialljmiller/SED_Tools) and as a standalone drop-in for workflows that use MESA-style atmosphere grids and filter transmission curves.
 
-Current version: **0.3.1** ([PyPI](https://pypi.org/project/sed-model/))
+Current version: **0.3.2** ([PyPI](https://pypi.org/project/sed-model/))
 
 ## Two paired models, one parameter language
 

{sed_model-0.3.1 → sed_model-0.3.2}/docs/testing.md

@@ -9,13 +9,13 @@ Both suites skip gracefully — with an explanatory reason — when the Fortran
 
 ## Data locations
 
-The tests look for SED_Tools data products at `~/SED_Tools/data/...` by default, overridable via environment variables:
+The tests look for SED_Tools data products in `~/.sed_tools/data`, then `~/SED_Tools/data`, then `$MESA_DIR/data/colors_data`, using the first location that exists. Each path can be overridden with an environment variable:
 
-| Variable | Default |
+| Variable | Path under the data root |
 |---|---|
-| `CC_KURUCZ_DIR` | `~/SED_Tools/data/stellar_models/Kurucz2003all` |
-| `CC_JOHNSON_DIR` | `~/SED_Tools/data/filters/Generic/Johnson` |
-| `CC_VEGA_SED` | `~/SED_Tools/data/stellar_models/vega_flam.csv` |
+| `CC_KURUCZ_DIR` | `stellar_models/Kurucz2003all` |
+| `CC_JOHNSON_DIR` | `filters/Generic/Johnson` |
+| `CC_VEGA_SED` | `stellar_models/vega_flam.csv` |
 
 ## Forward model: validated against MESA
 

{sed_model-0.3.1 → sed_model-0.3.2}/meson.build

@@ -2,7 +2,7 @@
 # and for the others the checks below give a readable error if one is missing.
 project(
   'sed_model',
-  version: '0.3.1',
+  version: '0.3.2',
   meson_version: '>=1.1.0',
 )
 

{sed_model-0.3.1 → sed_model-0.3.2}/sed_model/filters.py

@@ -227,8 +227,11 @@ def _load_filter_dat(path: Path) -> tuple[np.ndarray, np.ndarray]:
         raise FileNotFoundError(f"Filter file not found: {path}")
 
     delimiter = _sniff_delimiter(path)
+    # usecols: SED_Tools >= 0.4.0 appends a metadata field to the column row
+    # (``Wavelength,Transmission,FilterID=...;DetectorType=...``), which would
+    # otherwise make genfromtxt expect three columns.
     data = np.genfromtxt(path, comments="#", delimiter=delimiter,
-                         invalid_raise=False)
+                         usecols=(0, 1), invalid_raise=False)
 
     if data.ndim == 2:
         mask = np.isfinite(data[:, 0]) & np.isfinite(data[:, 1])

sed_model-0.3.2/tests/_data_paths.py

@@ -0,0 +1,29 @@
+"""Locations of the SED_Tools data products the tests use.
+
+Each path can be set with an environment variable; otherwise the first
+existing candidate is used (SED_Tools' own cache, the older ``~/SED_Tools``
+layout, then the data shipped with a MESA checkout).
+"""
+
+from __future__ import annotations
+
+import os
+
+_ROOTS = [
+    os.path.expanduser("~/.sed_tools/data"),
+    os.path.expanduser("~/SED_Tools/data"),
+]
+if os.environ.get("MESA_DIR"):
+    _ROOTS.append(os.path.join(os.environ["MESA_DIR"], "data", "colors_data"))
+
+
+def _find(env: str, *parts: str) -> str:
+    if os.environ.get(env):
+        return os.environ[env]
+    candidates = [os.path.join(root, *parts) for root in _ROOTS]
+    return next((c for c in candidates if os.path.exists(c)), candidates[0])
+
+
+KURUCZ_DIR  = _find("CC_KURUCZ_DIR", "stellar_models", "Kurucz2003all")
+JOHNSON_DIR = _find("CC_JOHNSON_DIR", "filters", "Generic", "Johnson")
+VEGA_SED    = _find("CC_VEGA_SED", "stellar_models", "vega_flam.csv")

{sed_model-0.3.1 → sed_model-0.3.2}/tests/test_forward.py

@@ -33,18 +33,7 @@ import numpy as np
 # ---------------------------------------------------------------------------
 # Path configuration
 # ---------------------------------------------------------------------------
-KURUCZ_DIR  = os.environ.get(
-    "CC_KURUCZ_DIR",
-    os.path.expanduser("~/SED_Tools/data/stellar_models/Kurucz2003all"),
-)
-JOHNSON_DIR = os.environ.get(
-    "CC_JOHNSON_DIR",
-    os.path.expanduser("~/SED_Tools/data/filters/Generic/Johnson"),
-)
-VEGA_SED    = os.environ.get(
-    "CC_VEGA_SED",
-    os.path.expanduser("~/SED_Tools/data/stellar_models/vega_flam.csv"),
-)
+from _data_paths import KURUCZ_DIR, JOHNSON_DIR, VEGA_SED
 
 R_SUN  = 6.957e10
 D_10PC = 3.0857e19

{sed_model-0.3.1 → sed_model-0.3.2}/tests/test_inverse.py

@@ -34,18 +34,7 @@ import pytest
 # ---------------------------------------------------------------------------
 # Paths
 # ---------------------------------------------------------------------------
-KURUCZ_DIR  = os.environ.get(
-    "CC_KURUCZ_DIR",
-    os.path.expanduser("~/SED_Tools/data/stellar_models/Kurucz2003all"),
-)
-JOHNSON_DIR = os.environ.get(
-    "CC_JOHNSON_DIR",
-    os.path.expanduser("~/SED_Tools/data/filters/Generic/Johnson"),
-)
-VEGA_SED    = os.environ.get(
-    "CC_VEGA_SED",
-    os.path.expanduser("~/SED_Tools/data/stellar_models/vega_flam.csv"),
-)
+from _data_paths import KURUCZ_DIR, JOHNSON_DIR, VEGA_SED
 
 R_SUN  = 6.957e10
 D_10PC = 3.0857e19

{sed_model-0.3.1 → sed_model-0.3.2}/tests/test_kernels.py

@@ -142,3 +142,26 @@ def test_linear_interp_handles_nan_cube_node():
     flux, ierr = cc.interp_sed_linear(0.4, 0.0, 0.0, x, one, one, cube)
     assert np.all(np.isfinite(flux))
     assert ierr >= 1
+
+
+def test_filter_header_row_with_metadata_field(tmp_path):
+    """SED_Tools >= 0.4.0 appends ``;``-separated metadata as a third comma
+    field of the column row.  The loader reads only the two data columns, for
+    that layout, the bare row, and the older leading ``# Key: value`` lines."""
+    from sed_model.filters import load_filters
+
+    rows = "3200.0,2.4e-08\n3300.0,0.5\n3400.0,0.9\n3500.0,0.0\n"
+    layouts = {
+        "bare": "Wavelength,Transmission\n" + rows,
+        "meta": ("Wavelength,Transmission,FilterID=GAIA/GAIA3.G;DetectorType=photon;"
+                 "DetectorTypeSource=svo-curve-match;WavelengthUnit=Angstrom;"
+                 "Components=filter+qe+instrument\n" + rows),
+        "comments": "# FilterID: GAIA/GAIA3.G\n# DetectorType: photon\nWavelength,Transmission\n" + rows,
+    }
+    waves = {}
+    for name, text in layouts.items():
+        (tmp_path / f"{name}.dat").write_text(text)
+        (f,) = load_filters([tmp_path / f"{name}.dat"])
+        waves[name] = (f.wavelengths.tolist(), f.transmission.tolist())
+    assert waves["meta"] == waves["bare"] == waves["comments"]
+    assert waves["meta"][0] == [3200.0, 3300.0, 3400.0, 3500.0]