Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ENH: move flow/pressure calls to the optics library #114

Merged
merged 4 commits into from
Feb 9, 2024
Merged

ENH: move flow/pressure calls to the optics library #114

merged 4 commits into from
Feb 9, 2024

Conversation

nrwslac
Copy link
Contributor

@nrwslac nrwslac commented Feb 6, 2024 •
edited
Loading

Description

  • move cooling readbacks to optics library
  • upgrade motion 2.0.1 -> 4.0.5
  • upgrade optics 0.6.1 -> 0.7.0
  • change G_PI lag monitoring 3urad -> 10urad to try and stop errors

Motivation and Context

  • implement alarm thresholds for NALMS

How Has This Been Tested?

ran on PLC.

Where Has This Been Documented?

Screenshots (if appropriate):

Pre-merge checklist

  • Code works interactively
  • Code contains descriptive comments
  • Test suite passes locally
  • Libraries are set to fixed versions and not Always Newest
  • Code committed with pre-commit (alternatively pre-commit run --all-files)

@nrwslac nrwslac marked this pull request as ready for review February 9, 2024 22:32
ZLLentz
ZLLentz approved these changes Feb 9, 2024
View reviewed changes
Copy link
Member

@ZLLentz ZLLentz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good based on the optics library PR (should have the same PV names as before, just using the library)

lcls-plc-rixs-optics/_Config/NC/Axes/g_pi.xti
@@ -1440,7 +1440,7 @@ External Setpoint Generation:
</Drive>
<Controller Name="Ctrl" CtrType="2">
<CtrPara PriorControlFactor="1">
<PosDiffControl Range="3" Time="0.2"/>
<PosDiffControl Range="10" Time="0.2"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is 10 urad?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

double checked and confirmed 10urad.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just making sure it's 10urad and not some grossly large physical quantity 👍

lcls-plc-rixs-optics/rixs_optics/rixs_optics.plcproj
@@ -249,19 +253,19 @@
</PlaceholderReference>
</ItemGroup>
<ItemGroup>
<LibraryReference Include="lcls-twincat-motion,2.0.1,SLAC">
<LibraryReference Include="lcls-twincat-motion,4.0.5,SLAC">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's quite the version bump

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trying to keep optics up to date 🏃‍♂️

@nrwslac nrwslac merged commit 9630fa8 into pcdshub:master Feb 9, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZLLentz ZLLentz ZLLentz approved these changes

@jyotiphy jyotiphy Awaiting requested review from jyotiphy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nrwslac @ZLLentz