Skip to content

Commit

Permalink
Corrected call of osc_start PR854
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Gruzinov committed Feb 21, 2024
1 parent d215a03 commit bb7335e
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions mxcubecore/HardwareObjects/Beamline.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ 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.
Expand Down Expand Up @@ -291,7 +291,6 @@ def machine_info(self):

__content_roles.append("machine_info")


@property
def authenticator(self):
"""Authenticator Hardware object
Expand Down Expand Up @@ -774,9 +773,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":
Expand All @@ -790,16 +789,16 @@ 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)

motor_positions = self.diffractometer.get_positions()
osc_start = motor_positions.get("phi", params["osc_start"])

osc_start = motor_positions.get("phi")

acq_parameters.osc_start = osc_start
kappa = motor_positions.get("kappa", False)
Expand Down

0 comments on commit bb7335e

Please sign in to comment.