Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] AbstractDiffractometer #695

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

[WIP] AbstractDiffractometer #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ff7b3f
Abstract diffractometer definition.
beteva Jan 11, 2022
eea06ef
MD2 implementation of AbstractDiffractometer.
beteva Jan 11, 2022
5ff96ef
Fix import bug.
beteva Apr 5, 2022
11c91f9
Implement get_motors, get_actuators and get_complex_equipment.
beteva Apr 5, 2022
33c251d
Make get_mototrs_positions consistent with the abstract method.
beteva Apr 5, 2022
92646c4
in_*_mode is a property.
beteva Apr 6, 2022
51bc88d
Add get_head_enum and get_phase_enum methods.
beteva Apr 6, 2022
34e6bdb
Add SSX head. get_motor_values returns dictionary, not list.
beteva Apr 25, 2022
97d8f5d
Changes to cope with the new diffractometer API
beteva Apr 27, 2022
63ca447
set_value_motors takes dictionary to be compliant with get_value_motors.
beteva Jul 20, 2022
50a6a0a
Unify actuator and complex_equipment in nstate_equipment.
beteva Oct 14, 2022
cd9b73e
Add get_motors implementation. Add get_movable_motors.
beteva Oct 14, 2022
14eebcb
Remove old code.
beteva Nov 2, 2022
10db57b
Rename method of local use only. Add list for value_to_enum. Cleanup.
beteva Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
385 changes: 0 additions & 385 deletions .pylintrc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/Beamline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
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"])
motor_positions = self.diffractometer.get_value_motors()
osc_start = motor_positions.get("omega", params["osc_start"])
acq_parameters.osc_start = round(float(osc_start), 2)
kappa = motor_positions.get("kappa", 0.0)
kappa = kappa if kappa else 0.0
Expand Down
Loading