Fix two more issues with ScopeSimple (#514)

scopesim/commands/scopesimple.py

@@ -181,15 +181,6 @@ def readout(
             List of HDUs containing simulation results.
 
         """
-        # If we have AutoExposure in the optical train and no dit or ndit was
-        # passed, assume the user wants to re-estimate them from given exptime.
-        if "auto_exposure" in self.optical_train:
-            kwargs["dit"] = kwargs.get("dit")
-            kwargs["ndit"] = kwargs.get("ndit")
-        else:
-            # Without AutoExposure, we need to get dit, ndit into !OBS
-            self.settings["!OBS.dit"] = kwargs.get("dit")
-            self.settings["!OBS.ndit"] = kwargs.get("ndit")
         self._last_readout = self.optical_train.readout(filename, **kwargs)
         return self.last_readout[0]
 

scopesim/commands/user_commands.py

@@ -291,7 +291,7 @@ def update(self, other=None, /, **kwargs):
                     mode_yaml = self.modes_dict[mode_name]
                     self._load_yaml_dict(mode_yaml)
 
-        if modes := kwargs.get("set_modes"):
+        if modes := list(kwargs.get("set_modes", [])):
             self.set_modes(*modes)
 
         # Calling underlying NestedMapping's update method to avoid recursion

scopesim/effects/fits_headers.py

@@ -459,7 +459,7 @@ def apply_to(self, hdul, **kwargs):
                     eff_name = eff_name.split()[0]
 
                 # get a resolved meta dict from the effect
-                eff_meta = deepcopy(opt_train[f"#{eff_name}.!"])
+                eff_meta = deepcopy(opt_train[eff_name].meta)
 
                 if self.meta["add_excluded_effects"] and not eff_meta["include"]:
                     continue

scopesim/tests/tests_commands/test_scopesimple.py

@@ -19,7 +19,14 @@ def test_instrument_name_in_str(self):
         simple = Simulation("basic_instrument")
         assert "basic_instrument" in str(simple)
 
-    @pytest.mark.xfail(reason="DIT, NDIT currently broken")
+    def test_default_mode_works(self):
+        simple = Simulation("basic_instrument")
+        assert simple.mode == "imaging"
+
+    def test_init_mode_works(self):
+        simple = Simulation("basic_instrument", "spectroscopy")
+        assert simple.mode == "spectroscopy"
+
     def test_full_workflow_runs(self):
         simple = Simulation("basic_instrument")
         src = st.star(flux=15)