This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
1474 panda gridscan smargon speed #1498
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
olliesilvester
suggested changes
Aug 2, 2024
There was a problem hiding this comment.
Looks mostly good, but the main comments:
-
I don't think we need a separate pulse block. I also think we can combine the 'wait for position and send one pulse' and 'send all other pulses' steps.
-
I know this was me originally, but I think we should try making the deadtime equal to what it says in the eiger manual, 100 ns
-
I haven't looked at the yaml file in massive detail, but we should make sure the position part of this sequencer table is ignored now, like in
/dls_sw/i03/software/daq_configuration/panda_configs/flyscan_pcap_ignore_seq.yaml. This was previously causing a race condition in the panda ioc, which has apparently been fixed now, but still better to be safe.
Comment on lines
50
to
55
| 3. Send out the remaining x_steps - 1 triggers every time_between_steps_ms | ||
| 4. Wait for physical trigger from motion script to mark change of direction | ||
| 5. Wait for POSA (X2) to be less than X_START + X_STEP_SIZE * x_steps + exposure distance, then | ||
| send 1 trigger | ||
| 6. Send the remaining x_steps - 1 triggers every time_between_steps_ms | ||
| 7. Go back to step one. |
There was a problem hiding this comment.
Suggested change
| 3. Send out the remaining x_steps - 1 triggers every time_between_steps_ms | |
| 4. Wait for physical trigger from motion script to mark change of direction | |
| 5. Wait for POSA (X2) to be less than X_START + X_STEP_SIZE * x_steps + exposure distance, then | |
| send 1 trigger | |
| 6. Send the remaining x_steps - 1 triggers every time_between_steps_ms | |
| 7. Go back to step one. | |
| 3. Send out the remaining x_steps - 1 triggers every time_between_steps_ms, then stop sending triggers | |
| 4. Wait for physical trigger from motion script to mark change of direction | |
| 5. Wait for POSA (X2) to be less than X_START + X_STEP_SIZE * x_steps + exposure distance, then | |
| send 1 trigger | |
| 6. Send the remaining x_steps - 1 triggers every time_between_steps_ms | |
| 7. Go back to step one. |
…internally rather than using clock generator. * Add saved new panda layout inc. screehshot. * Update unit tests
rtuck99
force-pushed
the
1474_panda_gridscan_smargon_speed
branch
from
bd58549
to
41a6bec
Compare
|
Have simplified the sequence table but not removed the pulse generator or reduced the deadtime as discussed |
olliesilvester
suggested changes
Aug 7, 2024
| 7:Go back to step one. | ||
|
|
||
| 1. Wait for physical trigger from motion script to mark start of scan / change of direction | ||
| 2. Wait for POSA (X2) to be greater than X_START and send x_steps triggers every time_between_steps_ms |
There was a problem hiding this comment.
nit:
Suggested change
| 2. Wait for POSA (X2) to be greater than X_START and send x_steps triggers every time_between_steps_ms | |
| 2. Wait for POSA (X2) to be greater than X_START and send triggers every time_between_steps_ms, until x_steps triggers have been sent |
| @@ -127,7 +135,6 @@ def setup_panda_for_flyscan( | |||
|
|
|||
| Args: | |||
| panda (HDFPanda): The PandA Ophyd device | |||
| config_yaml_path (str): Path to the yaml file containing the desired PandA PVs | |||
| parameters (PandAGridScanParams): Grid parameters | |||
| initial_x (float): Motor positions at time of PandA setup | |||
| exposure_time_s (float): Detector exposure time per trigger | |||
There was a problem hiding this comment.
Missing sample_velocity_mm_per_s here
| @@ -139,7 +146,14 @@ def setup_panda_for_flyscan( | |||
| Yields: | |||
| Iterator[MsgGenerator] | |||
| """ | |||
| yield from load_device(panda, config_yaml_path) | |||
| assert parameters.x_steps > 0 | |||
There was a problem hiding this comment.
Suggested change
| assert parameters.x_steps > 0 | |
| assert parameters.x_steps > 0, "panda grid scan must have x_steps > 0 |
olliesilvester
approved these changes
Aug 7, 2024
olliesilvester
pushed a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
* (DiamondLightSource/hyperion#1474) Configure panda sequencer table to generate trigger sequence internally rather than using clock generator. * Add saved new panda layout inc. screehshot. * Update unit tests * (DiamondLightSource/hyperion#1474) move save-panda to dodal * (DiamondLightSource/hyperion#1474) Tidy up documentation * Make pyright happy * Remove redundant comment from tests * (DiamondLightSource/hyperion#1474) load the .yaml device layout as a module resource * Fix CI unit test failure due to bluesky event loop not running * Simplify the sequencer table as per PR comment * Update docstring
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1474
Corresponding save-panda cli utility:
Link to dodal PR (if required): DiamondLightSource/dodal#702
To test: