-
Notifications
You must be signed in to change notification settings - Fork 5
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.
Thank you! Couple of comments in code
@@ -174,6 +172,10 @@ def setup_panda_for_flyscan( | |||
# Values need to be set before blocks are enabled, so wait here | |||
yield from bps.wait(group="panda-config", timeout=GENERAL_TIMEOUT) | |||
|
|||
LOGGER.info(f"PandA sequencer table has been set to: {str(table)}") | |||
table_readback = yield from bps.rd(panda.seq[1].table) | |||
LOGGER.info(f"PandA sequencer table readback is: {str(table_readback)}") |
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.
Should: This is going to match the setpoint ideally so might be a bit noisy in the logs. If you think the bug is gone where we need to report it then remove it, otherwise can we put it as a debug?
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.
I'll put as debug now. When we're 100% sure there's no more issues with it I will remove
gridscan_start_time = time() | ||
LOGGER.info("Waiting for Zocalo device queue to have been cleared...") | ||
yield from bps.wait( | ||
ZOCALO_STAGE_GROUP | ||
) # Make sure ZocaloResults queue is clear and ready to accept our new data | ||
LOGGER.info("completing FGS") | ||
yield from bps.complete(gridscan, wait=True) | ||
LOGGER.info( | ||
f"Gridscan motion program took {round(time()-gridscan_start_time,2)} to complete" | ||
) |
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.
Should: We will hopefully have proper metrics soon so I don't think we should include printing timings like this
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.
It's quite useful to see how long things are taking while we are still increasing the run-up distance. I could just add it in temporarily when I do testing instead?
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.
OK, can you leave it in with a comment saying to remove it when we have metrics?
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.
Great, thank you!
…Source/1338_panda_improvements Panda improvements
Fixes #1338 and DiamondLightSource/mx-bluesky#278
I didn't add tests here since it was mainly just logging / I'm being a bit lazy, I can add some if needed though
To test: