-
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
WISH ORC: Fix unit tests and tidy up logic #7202
Comments
I have removed some unneeded PVs for things that are set as macros in OscillatingCollimator.cmd on db load as they will never change during operation of the ORC and even if they did it's just a case of changing them in the This needs to be tested on our test Galil first before we even consider going near WISH with it. |
Numbers look correct now so think i just want to test on the testbed galil + the real thing (shutdown?) to make sure it definitely still moves etc. |
Moving off project board as awaiting |
let happy for me to test so pulling back in progress |
tested on LET, all working, just waiting to hear back from WISH |
Working on WISH as well. I am going to be a bit cheeky and merge this as the ioc tests cover the VI logic and the rest can only be (and has been) confimed on the real ORCs with a camera on a stick in the sample position |
After coming back to the WISH ORC code while fixing the unit tests I realised that some logic was off (which was causing them to fail) - This logic isn't super important as it will still sweep at the correct velocity and give the steps readback meaning it's still collimating the beam correctly. The most important part of the WISH ORC is that it doesn't block the beam port - we fixed this after the uservar teething issues.
I also realised there were some variables which are actually mechanically bound to the WISH collimator such as radius etc. which we could bin off PVs for to simplify the code.
IMPORTANT: This needs to be tested on the device and verified against the Labview VI before it gets merged in, I don't want to break the collimator again....
The text was updated successfully, but these errors were encountered: