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

Lima Detector - Configurable trigger mode for Pilatus detector #880

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Lima Detector - Configurable trigger mode for Pilatus detector #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5a6e6a
[Detector] - Configurable trigger mode for Pilatus detector
marcus-oscarsson Feb 9, 2024
5fe5804
[Detector] - Updating detector status when doing stop acquisition
marcus-oscarsson Feb 9, 2024
6eac37f
[Detector] - Make sure detector is ready before preparing
marcus-oscarsson Feb 9, 2024
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
4 changes: 4 additions & 0 deletions mxcubecore/HardwareObjects/LimaEigerDetector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,14 @@ def set_detector_filenames(self, frame_number, start, filename):
self.get_channel_object("saving_format").set_value("HDF5")

def start_acquisition(self):
self.wait_ready()
logging.getLogger("user_level_log").info("Preparing acquisition")
self.get_command_object("prepare_acq")()
logging.getLogger("user_level_log").info("Detector ready, continuing")
self.get_command_object("start_acq")()

def stop_acquisition(self):
self.update_state(self.STATES.BUSY)
try:
self.get_command_object("stop_acq")()
except Exception:
Expand All @@ -244,9 +246,11 @@ def stop_acquisition(self):
time.sleep(1)
self.get_command_object("reset")()
self.wait_ready()
self.update_state(self.STATES.READY)

def reset(self):
self.stop_acquisition()
return True

@property
def status(self):
Expand Down
6 changes: 2 additions & 4 deletions mxcubecore/HardwareObjects/LimaPilatusDetector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,9 @@ def prepare_acquisition(
mesh_num_lines,
):
if mesh:
trigger_mode = "EXTERNAL_GATE"
# elif osc_range < 1e-4:
# trigger_mode = "INTERNAL_TRIGGER"
trigger_mode = self.get_property("mesh_trigger_mode", "EXTERNAL_GATE")
else:
trigger_mode = "EXTERNAL_TRIGGER"
trigger_mode = self.get_property("osc_trigger_mode", "EXTERNAL_GATE")

diffractometer_positions = HWR.beamline.diffractometer.get_positions()
self.start_angles = list()
Expand Down
Loading