-
Notifications
You must be signed in to change notification settings - Fork 2
Beamtime_october #38
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
Beamtime_october #38
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Dylan,
This PR looks good to me! I just noticed a couple of minor issues:
test_redis.pyandtest_listener.pyare failing the unit tests.- Should we consider using
TiledPublisherinxps_operatorand disabling it inlse_operator, while sending thetiled_urlin the WebSocket message?
You outlined three possible ways to bridge the gap between xps_operator and lse_operator last week:
- In XPS: create a ZMQ frame publisher.
- In LSE (current approach): implement a WebSocket listener that consumes the messages produced by the XPS code.
- In XPS: publish the frames to Tiled, and in LSE: read them from Tiled as they arrive.
Would you like me to create a new PR for option 3?
Also, should we move the WebSocket listener to ArroyoSAS?
| "width": message.shot_mean.array.shape[0], | ||
| "height": message.shot_mean.array.shape[1], | ||
| "fitted": json.dumps(peaks_output(message.detected_peaks.df)), | ||
| "shot_num": message.shot_num, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One note about shot_num: I noticed that it starts from 1 instead of 0 during beamtime. It works well — just a note for awareness.
Shall we add tiled_url for shot_mean in the websocket message?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeas, I like the tiled_url for shot_mean, but we'll need to reconstitute the TiledPublisher here to do that.
|
I'm not sure about TiledPublisher. It's getting a little complicated to keep all of these things separate. How would it know where in tiled to publish in a way that coordinates with other things that LSE is writing into tiled? Maybe we need to talk in front of a white board? |
In XPS: create a ZMQ frame publisher. I like the last one the best. In a near future world, Tiled is a perfect place for this, especially with the websockets code that it now has. We haven't yet played with tiled websockets here at the ALS, but maybe it's time! |
Sounds good. It seems we could also use tiled_websocket for XPS, as we already use it for the SMI beamtime. |
Sure, let’s discuss it later. |
This PR includes changes that were made to get things working in the October 2025 XPS beamtime.
Changes include:
Global renaming of
settings.xpstosettings.xps_operatorfor clarityRenaming of
arroyoimports toarroyopyto keep up with api change in arroyopy package.Fix of a nasty off-by-one error calculcating how many frames go into a shot
Change to the constructor for
XPSWSResultPublisherto be more consistent with other places that we pass websocket information.Removal o the
TiledPublisherfrom theprocessor_cli.pymodule. Should this be configurable? Undone? The latent space explorer now writes results inlcuding the full shot heat map. Should we depcrecate TiledPublisher?