bluesky / suitcase-core

data export facilities for NSLS-II
https://blueskyproject.io/suitcase
Other
2 stars 13 forks source link

quick change based on new databroker #44

Closed licode closed 6 years ago

codecov-io commented 7 years ago

Codecov Report

Merging #44 into master will decrease coverage by 3.6%. The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #44      +/-   ##
==========================================
- Coverage   95.82%   92.21%   -3.61%     
==========================================
  Files           7        7              
  Lines        1125     1130       +5     
==========================================
- Hits         1078     1042      -36     
- Misses         47       88      +41
Impacted Files Coverage Δ
suitcase/tests/test_spec.py 100% <100%> (ø) :arrow_up:
suitcase/tests/conftest.py 100% <100%> (ø) :arrow_up:
suitcase/tests/test_hdf5.py 94.39% <100%> (-3.55%) :arrow_down:
suitcase/hdf5.py 79.59% <100%> (-10.41%) :arrow_down:
suitcase/nexus.py 85.1% <100%> (-7.21%) :arrow_down:
suitcase/spec.py 93.23% <100%> (-2.53%) :arrow_down:
suitcase/tests/test_nexus.py 95% <100%> (-3.27%) :arrow_down:
... and 2 more

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 2311c0f...eaf2083. Read the comment docs.

licode commented 7 years ago

If no conflict, this is to be merged soon.

tacaswell commented 7 years ago

Can you address why spec.SpecFile now errors?

licode commented 7 years ago

Ok, work on new comments

tacaswell commented 7 years ago

@danielballan where did you fixes to livespec from CHX end up?

danielballan commented 7 years ago

Currently xf11id-ws1:~xf11id/Repos/suitcase

licode commented 7 years ago

Do you want to send a PR for that fix?

licode commented 7 years ago

I will take care of that fix.

danielballan commented 7 years ago

I appreciate that offer, but I left a mixture of necessary and (we later learned) unnecessary changes. I had better sort through them myself.

danielballan commented 7 years ago

I don't think I can do this confidently without testing at CHX one more time. Let's punt this to Tuesday or Wednesday -- depending on how things go at CMS.

licode commented 7 years ago

ok, I will review the pr when it is ready. After those fixes, we can add a new version number here.

tacaswell commented 7 years ago

@licode any progress on fixing the spec related code?

danielballan commented 7 years ago

This is waiting on me to extract and review the hotfix I deployed at CHX. Li dutifully reminded me of this -- totally my fault that it hasn't gotten done yet.

licode commented 6 years ago

@danielballan , want to quickly check this? I am going to squash commits.

danielballan commented 6 years ago

This should be a high priority. I think CHX is having problems that are fixed by this PR.

jrmlhermitte commented 6 years ago

If this PR is too long, could we add the hdf5 fix separately? LIX also needs this. I added a dirty fix for them but I'd rather not keep it long. thanks :-)

danielballan commented 6 years ago

@jrmlhermitte Can you hoist that "dirty fix" into a PR on here?

jrmlhermitte commented 6 years ago

@danielballan the dirty fix was a personalized fix. What was happening is that currently suitcase calls fill_event which relies on the legacy db. At LIX, they had to write a custom handler to handle all cases of their file format, which we added to the db used (db = Broker.from_config(lix_config)). Basically, I add this custom handler to the legacy db:

from databroker.databroker import DataBroker as db2
db2.reg.register_handler("AD_CBF", PilatusCBFHandler, overwrite=True)

we make sure to call it db2 so as to not conflict with the existing db. Also, this db2 I believe reads from _legacy_config.yml and not the same config that is used in the startup file but I have made sure they're the same. Small point but I thought I would point that out. I don't recommend PR'ing this. I can ask Lin to update his profiles to github so we can keep track of this change. (https://www.github.com/nsls-ii-lix/profile_processing)

EDIT: Modified the fix code, should import DataBroker not databroker