-
Notifications
You must be signed in to change notification settings - Fork 59
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
Lens4escan #1202
base: master
Are you sure you want to change the base?
Lens4escan #1202
Conversation
pcdsdevices/lens.py
Outdated
z_pos = (dist - self.z_offset) * self.z_dir * 1000 | ||
z_pos = z_pos - 100 # dirty trick to get z in the range |
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.
DO NOT FORGET TO REMOVE BEFORE MERGE
@@ -186,11 +213,13 @@ def forward(self, pseudo_pos): | |||
AttributeError | |||
If pseudo motor is not setup for use. | |||
""" | |||
if not np.isclose(pseudo_pos.beam_size, self.beam_size.position): | |||
# if not np.isclose(pseudo_pos.beam_size, self.beam_size.position): | |||
if True: |
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.
Note to self: to check again
Are we looking to merge this in addition to #1194 ? It seems like there's some duplicated work here |
Yes, I expect #1194 to be merged first. This is sort of the next step and will likely take a bit more time. |
Description
Make lens stack class usable for energy scans with the CCM
Motivation and Context
This includes:
How Has This Been Tested?
Where Has This Been Documented?
Pre-merge checklist
DO NOT FORGET TO REMOVE https://github.com/pcdshub/pcdsdevices/pull/1202/files#diff-5a91e8b8e2d4fabd6201376dd1c45357ec3ccf379d64d91641b430e7cad6b84aR222 BEFORE MERGE