From 4f5c9a9e31696f71cf81b7bd89fed5392a77006f Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Thu, 15 Feb 2024 10:42:43 +0100 Subject: [PATCH] More cmds and kwargs stuff --- scopesim/effects/effects.py | 2 +- scopesim/effects/spectral_trace_list.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scopesim/effects/effects.py b/scopesim/effects/effects.py index a21e1745..eeb48f4b 100644 --- a/scopesim/effects/effects.py +++ b/scopesim/effects/effects.py @@ -34,7 +34,7 @@ class Effect(DataContainer): """ - def __init__(self, **kwargs): + def __init__(self, cmds=None, **kwargs): super().__init__(**kwargs) self.meta["z_order"] = [] self.meta["include"] = True diff --git a/scopesim/effects/spectral_trace_list.py b/scopesim/effects/spectral_trace_list.py index 609fd35a..ff8c3cfe 100644 --- a/scopesim/effects/spectral_trace_list.py +++ b/scopesim/effects/spectral_trace_list.py @@ -471,8 +471,8 @@ class SpectralTraceListWheel(Effect): } _current_str = "current_trace_list" - def __init__(self, **kwargs): - super().__init__(**kwargs) + def __init__(self, cmds=None, **kwargs): + super().__init__(cmds, **kwargs) check_keys(kwargs, self.required_keys, action="error") params = { @@ -487,6 +487,8 @@ def __init__(self, **kwargs): path = self._get_path() self.trace_lists = {} + if "name" in kwargs: + kwargs.pop("name") for name in from_currsys(self.meta["trace_list_names"], self.cmds): fname = str(path).format(name) self.trace_lists[name] = SpectralTraceList(filename=fname,