diff --git a/esbo_etc/classes/optical_component/Filter.py b/esbo_etc/classes/optical_component/Filter.py index 925357d..c427ac3 100644 --- a/esbo_etc/classes/optical_component/Filter.py +++ b/esbo_etc/classes/optical_component/Filter.py @@ -11,10 +11,12 @@ class Filter(AHotOpticalComponent): A class to model a filter component and its thermal emission. The model can be created from a file, the name of a band or a custom spectral range. """ - _band = dict(U=dict(cwl=366 * u.nm, bw=68 * u.nm), B=dict(cwl=438 * u.nm, bw=98 * u.nm), - V=dict(cwl=545 * u.nm, bw=89 * u.nm), R=dict(cwl=641 * u.nm, bw=220 * u.nm), - I=dict(cwl=798 * u.nm, bw=240 * u.nm), J=dict(cwl=1220 * u.nm, bw=300 * u.nm), - H=dict(cwl=1630 * u.nm, bw=400 * u.nm), K=dict(cwl=2190 * u.nm, bw=600 * u.nm)) + _band = dict(U=dict(cwl=365 * u.nm, bw=68 * u.nm), B=dict(cwl=440 * u.nm, bw=98 * u.nm), + V=dict(cwl=550 * u.nm, bw=89 * u.nm), R=dict(cwl=700 * u.nm, bw=220 * u.nm), + I=dict(cwl=900 * u.nm, bw=240 * u.nm), J=dict(cwl=1250 * u.nm, bw=300 * u.nm), + H=dict(cwl=1650 * u.nm, bw=400 * u.nm), K=dict(cwl=2200 * u.nm, bw=600 * u.nm), + L=dict(cwl=3600 * u.nm, bw=1200 * u.nm), M=dict(cwl=4800 * u.nm, bw=800 * u.nm), + N=dict(cwl=10200 * u.nm, bw=2500 * u.nm)) @u.quantity_input(temp=[u.Kelvin, u.Celsius], obstructor_temp=[u.Kelvin, u.Celsius]) def __init__(self, parent: IRadiant, transmittance: Union[SpectralQty, Callable[[u.Quantity], u.Quantity]], diff --git a/esbo_etc/classes/target/BlackBodyTarget.py b/esbo_etc/classes/target/BlackBodyTarget.py index 43721a7..da79667 100644 --- a/esbo_etc/classes/target/BlackBodyTarget.py +++ b/esbo_etc/classes/target/BlackBodyTarget.py @@ -10,16 +10,17 @@ class BlackBodyTarget(ATarget): This class models the spectral flux density of a star of given magnitude using as black body radiator """ # Bands from Handbook of Space Astronomy and Astrophysics - # band_sfd = {"U": 1790*u.Jansky, "B": 4063*u.Jansky, "V": 3636*u.Jansky, "R": 3064*u.Jansky, - # "I": 2416*u.Jansky, "J": 1590*u.Jansky, "H": 1020*u.Jansky, "K": 640*u.Jansky} - _band = dict(U=dict(wl=366 * u.nm, sfd=4.175e-11 * u.W / (u.m ** 2 * u.nm)), - B=dict(wl=438 * u.nm, sfd=6.32e-11 * u.W / (u.m ** 2 * u.nm)), - V=dict(wl=545 * u.nm, sfd=3.631e-11 * u.W / (u.m ** 2 * u.nm)), - R=dict(wl=641 * u.nm, sfd=2.177e-11 * u.W / (u.m ** 2 * u.nm)), - I=dict(wl=798 * u.nm, sfd=1.126e-11 * u.W / (u.m ** 2 * u.nm)), - J=dict(wl=1220 * u.nm, sfd=3.15e-12 * u.W / (u.m ** 2 * u.nm)), - H=dict(wl=1630 * u.nm, sfd=1.14e-12 * u.W / (u.m ** 2 * u.nm)), - K=dict(wl=2190 * u.nm, sfd=3.96e-13 * u.W / (u.m ** 2 * u.nm))) + _band = dict(U=dict(wl=365 * u.nm, sfd=4.27e-11 * u.W / (u.m ** 2 * u.nm)), + B=dict(wl=440 * u.nm, sfd=6.61e-11 * u.W / (u.m ** 2 * u.nm)), + V=dict(wl=550 * u.nm, sfd=3.64e-11 * u.W / (u.m ** 2 * u.nm)), + R=dict(wl=700 * u.nm, sfd=1.74e-11 * u.W / (u.m ** 2 * u.nm)), + I=dict(wl=900 * u.nm, sfd=8.32e-12 * u.W / (u.m ** 2 * u.nm)), + J=dict(wl=1250 * u.nm, sfd=3.18e-12 * u.W / (u.m ** 2 * u.nm)), + H=dict(wl=1650 * u.nm, sfd=1.18e-12 * u.W / (u.m ** 2 * u.nm)), + K=dict(wl=2200 * u.nm, sfd=4.17e-13 * u.W / (u.m ** 2 * u.nm)), + L=dict(wl=3600 * u.nm, sfd=4.17e-13 * u.W / (u.m ** 2 * u.nm)), + M=dict(wl=4800 * u.nm, sfd=4.17e-13 * u.W / (u.m ** 2 * u.nm)), + N=dict(wl=10200 * u.nm, sfd=4.17e-13 * u.W / (u.m ** 2 * u.nm))) @u.quantity_input(wl_bins='length', temp=[u.Kelvin, u.Celsius], mag=u.mag) def __init__(self, wl_bins: u.Quantity, temp: u.Quantity = 5778 * u.K,