Unverified Commit 783ee600 authored by Akke Viitanen's avatar Akke Viitanen
Browse files

add numpy-version agnostic trapezoid function

parent 4b97404f
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ dependencies = [
    "ipywidgets",
    "matplotlib",
    "mypy",
    "numpy>=2.0.0",
    "numpy",
    "pandas",
    "pytest",
    "pytest-cov",
+10 −2
Original line number Diff line number Diff line
@@ -13,6 +13,14 @@ import astropy.units as u
import fitsio
import numpy as np


def my_trapezoid(*args, **kwargs):
    try:
        return np.trapezoid(*args, **kwargs)
    except AttributeError:
        return np.trapz(*args, **kwargs)


# filename_in  = sys.argv[1]
# filename_out = sys.argv[2]
# NOTE: git clone 'https://github.com/lsst/throughputs.git' data/egg/share/filter-db/inaf/throughputs
@@ -23,9 +31,9 @@ if __name__ == "__main__":
        print("Creating LSST filter for", filename_in)
        x, y = np.loadtxt(filename_in).T
        x *= u.nm.to(u.um)
        norm = np.trapezoid(y, x)
        norm = my_trapezoid(y, x)
        y /= norm
        assert np.isclose(np.trapezoid(y, x), 1.0)
        assert np.isclose(my_trapezoid(y, x), 1.0)

        filename_out = filename_in.replace(".dat", ".fits")
        fitsio.write(filename_out, {"LAM": np.array([x]), "RES": np.array([y])})