Need to initialise the environments with the right attributes

Author: stephen-riggs

src/murfey/client/multigrid_control.py

@@ -75,7 +75,10 @@ def __post_init__(self):
             default_destination=f"{datetime.now().year}",
             demo=self.demo,
             visit=self.visit,
-            data_collection_parameters=self.data_collection_parameters,
+            dose_per_frame=self.data_collection_parameters.get("dose_per_frame"),
+            gain_ref=self.data_collection_parameters.get("gain_ref"),
+            symmetry=self.data_collection_parameters.get("symmetry"),
+            eer_fractionation=self.data_collection_parameters.get("eer_fractionation"),
             instrument_name=self.instrument_name,
             # processing_only_mode=server_routing_prefix_found,
         )

src/murfey/client/tui/screens.py

@@ -1062,9 +1062,7 @@ def compose(self):
         if self.app._multigrid and self.app._processing_enabled:
             for k in self._context.user_params:
                 params_bulk.append(Label(k.label))
-                val = self.app._environment.data_collection_parameters.get(
-                    k.name
-                ) or str(k.default)
+                val = getattr(self.app._environment, k.name, str(k.default))
                 self._user_params[k.name] = val
                 if val in ("true", "True", True):
                     i = Switch(value=True, id=k.name, classes="input-destination")
@@ -1174,7 +1172,7 @@ def on_button_pressed(self, event):
             else:
                 self.app._start_rsyncer(s, d)
         for k, v in self._user_params.items():
-            self.app._environment.data_collection_parameters[k] = v
+            setattr(self.app._environment.data_collection_parameters, k, v)
         self.app.pop_screen()
         self.app.push_screen("main")
 

src/murfey/server/api/instrument.py

@@ -199,8 +199,6 @@ async def pass_proc_params_to_instrument_server(
                     "label": label,
                     "params": {
                         "dose_per_frame": proc_params.dose_per_frame,
-                        "extract_downscale": proc_params.extract_downscale,
-                        "particle_diameter": proc_params.particle_diameter,
                         "symmetry": proc_params.symmetry,
                         "eer_fractionation": proc_params.eer_fractionation,
                         "gain_ref": session.current_gain_ref,