Convert Lists to sets and update ruff command #78
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
src/i22_bluesky/plans/stopflow.py
Outdated
| @@ -206,7 +204,7 @@ def stopflow( | |||
|
|
|||
| stream_name = "main" | |||
| flyer = HardwareTriggeredFlyable(StaticSeqTableTriggerLogic(panda.seq[1])) | |||
| devices = [flyer] + detectors + [panda] + baseline | |||
| devices = {flyer} | detectors | {panda} | baseline | |||
There was a problem hiding this comment.
Suggested change
| devices = {flyer} | detectors | {panda} | baseline | |
| devices = {flyer, panda} | detectors | baseline |
src/i22_bluesky/plans/stopflow.py
Outdated
Comment on lines
216
to
217
| "detectors": {repr(device) for device in detectors}, | ||
| "baseline": {repr(device) for device in baseline}, |
There was a problem hiding this comment.
I think this should become {device.name for ..., as the repr for the devices is unuseful and with the device references the name is closer to referencing what we're actually using.
There was a problem hiding this comment.
changed to device.name + ":" + repr(device) for ... as discussed.
src/i22_bluesky/stubs/load_save.py
Outdated
| @@ -1,5 +1,6 @@ | |||
| import os | |||
| from pathlib import Path | |||
| from typing import Set | |||
tests/plans/test_stopflow.py
Outdated
| @@ -1,4 +1,5 @@ | |||
| import asyncio | |||
| from typing import Set | |||
DiamondJoseph
approved these changes
Jul 10, 2024
Comment on lines
+215
to
+217
| "panda": panda.name + ":" + repr(panda), | ||
| "detectors": {device.name + ":" + repr(device) for device in detectors}, | ||
| "baseline": {device.name + ":" + repr(device) for device in baseline}, |
There was a problem hiding this comment.
Suggested change
| "panda": panda.name + ":" + repr(panda), | |
| "detectors": {device.name + ":" + repr(device) for device in detectors}, | |
| "baseline": {device.name + ":" + repr(device) for device in baseline}, | |
| "panda": f"{panda.name}: {repr(panda)}", | |
| "detectors": f"{detector.name}: {repr(detector)}" for detector in detectors}, | |
| "baseline": f"{device.name}: {repr(device)}" for device in baseline}, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change function params which actually should be Sets (e.g. selction of detector) to Sets rather than Lists as the currently are. THis makes the JSONSchema for plans produced by BlueAPI more accurate. Also update ruff command from ruff to ruff check