Flake/ Black reformatted

Add default timeout 0
mxcube · Jan 4, 2024 · d25f603 · d25f603
1 parent 5a24596
commit d25f603
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 71 deletions.
diff --git a/mxcubecore/HardwareObjects/Beamline.py b/mxcubecore/HardwareObjects/Beamline.py
@@ -240,7 +240,6 @@ def _get_id_dict_rec(
 
         return _path
 
-
     # Signal handling functions:
     def emit(self, signal: Union[str, object, Any], *args) -> None:
         """Emit signal. Accepts both multiple args and a single tuple of args.
@@ -291,7 +290,6 @@ def machine_info(self):
 
     __content_roles.append("machine_info")
 
-
     @property
     def authenticator(self):
         """Authenticator Hardware object
@@ -457,7 +455,7 @@ def sample_changer_maintenance(self):
         return self._objects.get("sample_changer_maintenance")
 
     __content_roles.append("sample_changer_maintenance")
-    
+
     @property
     def harvester(self):
         """Harvester Hardware object
@@ -481,14 +479,13 @@ def harvester_maintenance(self):
 
     __content_roles.append("harvester_maintenance")
 
-
     @property
     def plate_manipulator(self):
         """**DEPRECATED**
         Plate Manuipulator Hardware object
-        NBNB TODO REMOVE THIS From qt version usage and 
-        and call HWR.beamline.sample_changer instead as plate_manipulator being 
-        treated as an alternative sample changer .
+        NBNB TODO REMOVE THIS From qt version usage and
+        and call HWR.beamline.sample_changer instead as plate_manipulator being
+        treated as an alternative sample changer.
 
         Returns:
             Optional[AbstractSampleChanger]:
@@ -801,9 +798,9 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
 
         acq_parameters = queue_model_objects.AcquisitionParameters()
 
-        #logging.getLogger("HWR").debug(f"""
-            #Beamline object. Getting acquisition parameters for acquisition type {acquisition_type}
-        #""")
+        # logging.getLogger("HWR").debug(f"""
+        # Beamline object. Getting acquisition parameters for acquisition type {acquisition_type}
+        # """)
 
         params = self.default_acquisition_parameters["default"].copy()
         if acquisition_type != "default":
@@ -817,9 +814,9 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
 
                 params.update(dd0)
 
-        #logging.getLogger("HWR").debug(f"""
-              #params are {params}
-        #""")
+        # logging.getLogger("HWR").debug(f"""
+        # params are {params}
+        # """)
 
         for tag, val in params.items():
             setattr(acq_parameters, tag, val)

diff --git a/mxcubecore/HardwareObjects/Harvester.py b/mxcubecore/HardwareObjects/Harvester.py
@@ -134,7 +134,7 @@ def _execute_cmd_exporter(self, cmd, *args, **kwargs):
         return : respond
         """
         ret = None
-        timeout = kwargs.pop("timeout", 900)
+        timeout = kwargs.pop("timeout", 0)
         if args:
             args_str = "%s" % "\t".join(map(str, args))
         if kwargs.pop("command", None):
@@ -164,7 +164,7 @@ def _execute_cmd_exporter(self, cmd, *args, **kwargs):
             if cmd.startswith("set"):
                 ret = exp_attr.set_value(args_str)
 
-        # self._wait_ready(timeout=timeout)
+        self._wait_ready(timeout=timeout)
         return ret
 
     # ---------------------- State --------------------------------