Skip to content

fix dcs.DCS serialisation #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.

Sign up for GitHub

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

Open
jhidding wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix dcs.DCS serialisation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
.pytest_cache

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
6 changes: 4 additions & 2 deletions cslib/noodles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from .dataframe import DataFrame, DCS
from .units import units

from .dcs import DCS as DCS2

class SerQuantity(Serialiser):
def encode(self, obj, make_rec):
Expand Down Expand Up @@ -53,7 +53,9 @@ def registry():
DataFrame: SerStandardObject(
DataFrame, ['data', 'units', 'comments']),
DCS: SerStandardObject(
DCS, ['energy', 'angle', 'cs'])
DCS, ['energy', 'angle', 'cs']),
DCS2: SerStandardObject(
DCS2, ['x', 'y', 'z', 'log'])
},
hooks={
'<quantity>': SerQuantity('<quantity>'),
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'Development Status :: 4 - Beta',
'Programming Language :: Python :: 3',
'Topic :: Scientific/Engineering :: Physics'],
install_requires=['pint==0.8.1', 'numpy==1.13.0', 'scipy==0.19.1', 'noodles[numpy,prov]==0.2.3'],
install_requires=['pint==0.8.1', 'numpy==1.13.0', 'scipy==0.19.1', 'noodles[numpy]==0.3.0'],
extras_require={
'test': ['pytest', 'sphinx']
},
Expand Down