search

pcdshub / pcdsdaq

Utilities for using the DAQ's pydaq, pycdb, and pyami libraries in conjunction with Bluesky
https://pcdshub.github.io/pcdsdaq
Other
0 stars 9 forks source link

FIX: Rapid cycle bug #44

Closed ZLLentz closed 6 years ago

ZLLentz commented 6 years ago

Description

Force the Daq class to wait at least 1s between stop and begin. The timer starts on stop, and the sleep is skipped if enough other things have happened.

closes #40

Also fix an unrelated bug where the Daq class wasn't correctly reset after a disconnect, and finally kill the deprecated argument.

I also redid some of the ami tests because they stopped working and the old tests didn't make sense to me any more.

Motivation and Context

Doing scans where there is very little going on between steps (e.g. no moves or really fast moves) AND there is enough during the step (>0.05s of action) results in pydaq.Control.stop routines that exit quickly but don't actually stop the daq in that time. Calling pydaq.Control.begin in this approx 0.45s window when the DAQ claims to be ready to run causes the command to hang forever.

How Has This Been Tested?

Test added

ZLLentz commented 6 years ago

I think this PR is where I want it to fix the rapid cycle bug. Some of the odd stuff in here is due to odd behavior in pydaq, but feel free to call me out on it.

ZLLentz commented 6 years ago

The tests pass locally, but are getting stalled out on the same matplotlib problem that was plaguing transfocator. This time the culprit is bluesky, which is doing the innocuous import matplotlib.

codecov-io commented 6 years ago

Codecov Report

Merging #44 into master will not change coverage. The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff          @@
##           master    #44   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files           5      5           
  Lines         763    770    +7     
=====================================
+ Hits          763    770    +7
Impacted Files Coverage Δ
pcdsdaq/daq.py 100% <100%> (ø) :arrow_up:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update efbd6be...0820ac9. Read the comment docs.

ZLLentz commented 6 years ago

I'm going to merge this as-is and use it as a starting point for the changes I discussed with @ddamiani