Merging run21 to master. #47
Merged
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
figuring out workflow from mfx-daq
`MFX_Timing` - updated event sequences.
…in-after-first-run added daq.end_run() to autorun
…in-after-first-run 15 illegal reconfigure for daqbegin after first run
18 fun with water
… handle color image gigE cameras.
…and thus not working.
30 launch xfel gui
…devices). Added the remove all to the laser_in() macro. This should remove the tfs lenses via remove_all(). The dg2_ds slits are commented out for now due to the issues.
…y wrappers that they have. Converted all calls to xcs to mfx. removed ccm code. Added an import to beamline.py that seems to have issues at the moment.
DOD code merge to run 21.
This is ancient. Looks okay to merge.
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.
End of run21. All relevant branches merged. Merging to master.