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

ENH: pyami #35

Closed ZLLentz closed 6 years ago

ZLLentz commented 6 years ago

Description

Add AmiDet Device that uses its prefix to do the pyami connection.
l3t configuration
add pyami to the pcdsdaq_lib_setup

Motivation and Context

pyami support was requested
closes #33

How Has This Been Tested?

Added tests that pass for full coverage and found a lot of rough edges in real sessions.

Where Has This Been Documented?

I added documentation to sphinx

codecov-io commented 6 years ago

Codecov Report

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

@@          Coverage Diff          @@
##           master    #35   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files           4      5    +1     
  Lines         526    597   +71     
=====================================
+ Hits          526    597   +71

Impacted Files	Coverage Δ
pcdsdaq/ami.py	`100% <100%> (ø)`

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 154391d...c607c0e. Read the comment docs.

codecov-io commented 6 years ago

Codecov Report

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

@@          Coverage Diff           @@
##           master    #35    +/-   ##
======================================
  Coverage     100%   100%            
======================================
  Files           4      5     +1     
  Lines         526    755   +229     
======================================
+ Hits          526    755   +229

Impacted Files	Coverage Δ
pcdsdaq/ami.py	`100% <100%> (ø)`
pcdsdaq/ext_scripts.py	`100% <100%> (ø)`	:arrow_up:
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 9a3adb5...2f806d1. Read the comment docs.

ZLLentz commented 6 years ago

rough edges are:

only gets 3/4 of events (???)
need to provide guess_ami_proxy somewhere from old blutil.guessAmiProxy
I don't actually know how to test the l3t stuff

ZLLentz commented 6 years ago

3/4 events went away, probably daq config related
added get_ami_proxy
tested l3t stuff

TODO:

fix handling of det filter string vs pyami filter string
check up on the correct defaults

ZLLentz commented 6 years ago

fixed handler of det filter string

TODO:

check up on correct defaults
look into how much of the config can be automatic
look into how we're going to activate the daq libraries
add a set_filter on a per-detector basis
consider using stage and unstage to create the pyami dets instead of trigger due to spammy prints

ZLLentz commented 6 years ago

TODO:

fix tests that I just broke
check up on correct defaults
fix broken docs build

ZLLentz commented 6 years ago

TODO:

Finish test work
Correct the defaults based on Silke's input
Add the monitor det functionality (normalize one detector by another)

ZLLentz commented 6 years ago

@teddyrendahl this is finally done. I opted to continue to make the pcdsdaq_lib_setup script manual instead of automatic on conda activate because you need a chance to let me know which hutch you are so I can set up the libraries appropriately. This means there will be a follow-up PR in hutch-python as well each each hutch repo to make sure the daq libraries are loaded correctly. It also means I'll be putting a PR into pcds-envs to remove the conda install pydaq in the script there.