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.

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

Fix eiger stream data publish #93

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Fix eiger stream data publish #93

merged 1 commit into from
Nov 23, 2023

Conversation

GDYendell
Copy link
Contributor

@GDYendell GDYendell commented Nov 21, 2023

Fixes #91

Base automatically changed from tickit-name-update to main November 22, 2023 06:32
@@ -430,5 +430,5 @@ def __init__(self, device: EigerDevice) -> None:

def after_update(self) -> None:
"""Updates IOC values immediately following a device update."""
buffered_data = self.device.stream.consume_data()
self.add_message_to_stream([list(buffered_data)])
if buffered_data := list(self.device.stream.consume_data()):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good patch but I think the proper fix is in the ZMQ adapter itself, have made an issue: DiamondLightSource/tickit#196

@abbiemery
Copy link
Collaborator

This will need rebasing again before merging, but LGTM.

Remove extra list nesting of eiger stream message and only add message
to stream if data is not empty.

Add test to ensure new behaviour.
@abbiemery abbiemery merged commit a5d4eca into main Nov 23, 2023
14 checks passed
@abbiemery abbiemery deleted the fix-eiger-stream branch November 23, 2023 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Eiger ZMQ broken against tickit master
3 participants