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.

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

add energy features to Diffractometer base class #44

Merged
merged 15 commits into from
Nov 2, 2020
Merged

Conversation

prjemian
Copy link
Contributor

@prjemian prjemian commented Oct 3, 2020

As requested, fixes #43 .

In #25, #26, and #42, an example was prepared to show how to connect energy from the local controls with the calc engine energy. The additional features were:

  • allow for an offset energy
  • allow for conversion of energy units to the keV used by the calc engine
  • add a flag to allow/block automatic updates of calc engine when control energy changes
  • direct command to bypass that lock yet keep the offset and units conversion

@ambarb, @stuartcampbell, @stuwilkins, @gfabbris : Your comments and suggestions are welcome.

@prjemian prjemian added this to the 0.3.15 milestone Oct 3, 2020
@prjemian prjemian self-assigned this Oct 3, 2020
@prjemian
Copy link
Contributor Author

prjemian commented Oct 3, 2020

This is marked as draft since the examples in the documentation need to be revised to use the new code additions.

hkl/diffract.py Outdated Show resolved Hide resolved
@prjemian prjemian marked this pull request as ready for review October 9, 2020 20:09
@prjemian
Copy link
Contributor Author

prjemian commented Oct 9, 2020

@jklynch @MikeHart85 @mrakitin Might need to build the documentation to review

@prjemian
Copy link
Contributor Author

@ambarb, @stuartcampbell, @stuwilkins, @gfabbris : Can you review this PR?
I'd like to merge this before the end of the month.
Latest documentation attached here as PDF: hklpy.pdf

@prjemian
Copy link
Contributor Author

@jklynch @MikeHart85 @mrakitin Can you review please? See PDF (above) for build documentation.

@stuwilkins
Copy link
Contributor

@prjemian Will look at this today.

@prjemian
Copy link
Contributor Author

I'm ready to merge this today if there are no objections.

@ambarb
Copy link

ambarb commented Oct 30, 2020

@prjemian I had a quick look this morning and most of the changes look like ones we discussed as you were developing other things. Just wanted to follow up and say that some of these changes are really exciting (particularly locking on beam line E and using the EGU pv so people can drive the beamline as they are accustomed (eV or keV).

@prjemian prjemian merged commit 0eba82a into main Nov 2, 2020
@prjemian prjemian deleted the 43-energy-features branch November 2, 2020 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update _energy_changed() in Diffractometer
3 participants