-
Notifications
You must be signed in to change notification settings - Fork 9
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
PVPositionerSoftDone should set done False at start of move #954
Conversation
Tests pass locally but not in CI here. Setting PR back to draft for now. |
I'd like to merge in the next day (so apstools can be released on Friday). Any objections to merging by the end of business today? |
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.
It looks good to me. I should be able to test it with the lakeshore that had issues before, but it'd be either late today or tomorrow morning.
I'll wait until your report tomorrow. Or end of Thursday comes. |
Tested using a Lakeshore 340. The original problem is fixed. However, I found another issue: if a ramp is used, the device marks the movement as done even though it is not. But I think I know where the problem is, the
to: sp = self.setpoint.get() if self.update_target is False else self.target.get() (this worked for the lakeshore) |
Trying that solution locally. That will need more investigation. Many unit tests (in |
On debugging, the assignment One other case fails differently: FAILED apstools/devices/tests/test_positioner_soft_done.py::test_move_and_stopped_early - AssertionError: p.name='pos' rb=6.88000 sp=6.88000 tol=0.0001 dt=0.2817s p.done=Signal(name='pos_done', parent='pos', value=False, timestamp=1... |
916 pv positioner soft done update
@prjemian: Trying to fix the other PR I ended up screwing up this branch. To fix it, I think it will involve reverting to commit 9a5afb9, then re-merging main into 916-PVPositionerSoftDone-update (commit f6c366d) |
Alternatively, can you create a new branch and copy into it the changes you have? |
Locally, I still have the most recent branch commit. These are the last two commits: (base) prjemian@arf:~/.../BCDA-APS/apstools$ git log
commit b49aebbdcbf352f72fa96607d71cb01891474f99 (HEAD -> 990-listdevice-RuntimeError, origin/990-listdevice-RuntimeError)
Author: Pete R Jemian <prjemian@gmail.com>
Date: Mon Aug 26 16:59:13 2024 -0500
MNT #990
commit 4a152d0894c9395045eaea6ad00b7721163dfc15 (origin/main, origin/HEAD, main)
Merge: 66256f66 ae2bc654
Author: Pete R Jemian <prjemian@users.noreply.github.com>
Date: Wed Aug 21 14:25:50 2024 -0500
Merge pull request #1011 from BCDA-APS/1010-nodefaults
Remove Anaconda defaults channel
@MDecarabas Thanks! |
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.
Let's go with these changes, over #1014. Later, we can restore the Py3.8 run in the CI.
These changes:
|
@pytest.mark.local
decorator. #810