-
Notifications
You must be signed in to change notification settings - Fork 2
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
Component for motors moving halfs of JF4M detector #224
Open
egorsobolev
wants to merge
2
commits into
master
Choose a base branch
from
feat/jf4m-motors
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
::: extra.components.AGIPD1MQuadrantMotors | ||
|
||
::: extra.components.JF4MHalfMotors |
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
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
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -196,7 +196,10 @@ | |||||
src = pattern.format(**args) | ||||||
label = ''.join(f"{n}{v}" for n, v in args.items()) | ||||||
|
||||||
if src in dc.control_sources and position_key in dc[src].keys(): | ||||||
if ( | ||||||
src in dc.control_sources and | ||||||
position_key in dc[src].keys(inc_timestamps=False) | ||||||
): | ||||||
motors[label] = (src, position_key) | ||||||
continue | ||||||
|
||||||
|
@@ -244,7 +247,7 @@ | |||||
dc (extra_data.DataCollection): | ||||||
The data | ||||||
detector_id (str): | ||||||
The detector ID, e.g. SPB_IRU_AGIPD1M or SPB_IRU_AGIPD1M | ||||||
The detector ID, e.g. SPB_IRU_AGIPD1M or MID_EXP_AGIPD1M | ||||||
|
||||||
Raises: | ||||||
ValueError: | ||||||
|
@@ -278,3 +281,64 @@ | |||||
|
||||||
detector_id, detector_motors = all_motors.popitem() | ||||||
super().__init__(dc, detector_id, detector_motors, q=groups, m=motors) | ||||||
|
||||||
|
||||||
class JF4MHalfMotors(DetectorMotors): | ||||||
"""Interface to Jungfrau 4M half motors. | ||||||
|
||||||
Example usage in a Jupyter notebook: | ||||||
```python | ||||||
----------------------------------------------------------- | ||||||
In [1]: |motors = JF4MHalfMotors(run) | | ||||||
|motors | | ||||||
----------------------------------------------------------- | ||||||
Out[1]: <JF4MHalfMotors(2, 1)for SPB_IRDA_JF4M at | ||||||
2024-08-21T19:38:47.690044000> | ||||||
``` | ||||||
""" | ||||||
# SPB | ||||||
# SPB_IRDA_JF4M/MOTOR/X{q+1} | ||||||
# SPB_IRDA_JF4M/MOTOR/Z | ||||||
|
||||||
KNOWN_DETECTORS = ["SPB_IRDA_JF4M"] | ||||||
|
||||||
def __init__(self, dc, detector_id=None): | ||||||
""" | ||||||
Args: | ||||||
dc (extra_data.DataCollection): | ||||||
The data | ||||||
detector_id (str): | ||||||
The detector ID, e.g. SPB_IRDA_JF4M | ||||||
|
||||||
Raises: | ||||||
ValueError: | ||||||
If motors are not found or multiple motor groups are found | ||||||
""" | ||||||
pattern = "{detector_id}/MOTOR/X{q}" | ||||||
|
||||||
num_groups = 2 | ||||||
num_motors = 1 | ||||||
groups = list(range(1, num_groups + 1)) | ||||||
motors = list(range(1, num_motors + 1)) | ||||||
|
||||||
data_selectors = sources_by_class(dc) | ||||||
|
||||||
all_motors = {} | ||||||
detectors = ( | ||||||
self.KNOWN_DETECTORS if detector_id is None else [detector_id]) | ||||||
for det_id in detectors: | ||||||
pattern = det_id + "/MOTOR/X{q}" | ||||||
det_motors = find_motors(dc, pattern, self._position_key, | ||||||
data_selectors, q=groups, m=motors) | ||||||
if det_motors: | ||||||
all_motors[det_id] = det_motors | ||||||
|
||||||
if len(all_motors) == 0: | ||||||
raise ValueError("Motors are not found") | ||||||
elif len(all_motors) > 1: | ||||||
raise ValueError( | ||||||
"Many detector found: {', '.join(det_motors.keys())}. " | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Nitpicking, it might be nicer formatting to print the 'please specify' message on a new line. |
||||||
"Please specify 'detector_id'") | ||||||
|
||||||
detector_id, detector_motors = all_motors.popitem() | ||||||
super().__init__(dc, detector_id, detector_motors, q=groups, m=motors) | ||||||
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.
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.
This should work, and can be faster than loading the list of keys.