Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
utmpn
cassandra
Commits
7c496a76
Commit
7c496a76
authored
May 25, 2018
by
julian.gethmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename sul_field -> sul_gap
parent
7f6cfa7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
CHANGELOG.rst
CHANGELOG.rst
+5
-4
src/cassandra/cassandra.py
src/cassandra/cassandra.py
+8
-5
No files found.
CHANGELOG.rst
View file @
7c496a76
...
...
@@ -4,12 +4,13 @@ Changelog
* [TODO] Add the raw PV name option to the command line interface
0.7.2 (2018-)
0.7.2 (2018-
05-25
)
------------------
*
r
emove not implemented argument `show_url` of `dump_cassandra_data()`
*
w
rite tests that are independent of access to the IBPT network
*
m
ove directory structure to new one (`cassandra`->`src/cassandra`) to complete `PyScaffold` structure
*
R
emove not implemented argument `show_url` of `dump_cassandra_data()`
*
W
rite tests that are independent of access to the IBPT network
*
M
ove directory structure to new one (`cassandra`->`src/cassandra`) to complete `PyScaffold` structure
* Upgrade PyScaffold to be compatible with new setuptools versions
* Rename `sul_field` to `sul_gap`, because that is what is returned!
0.7.1 (2017-10-31)
------------------
...
...
src/cassandra/cassandra.py
View file @
7c496a76
...
...
@@ -49,6 +49,9 @@ class Pvs(object):
Attributes:
pv (dict): PV shortcuts
.. versionchanged:: 0.7.2
Rename sul_field to sul_gap
"""
pv
=
{
"fill"
:
"A:SR:OperationStatus:01:FillNumber"
,
...
...
@@ -60,7 +63,7 @@ class Pvs(object):
"nu_y"
:
"A:SR:BBB:01:Y:SRAM:PEAKTUNE2"
,
"nu_x"
:
"A:SR:BBB:01:X:SRAM:PEAKTUNE2"
,
"catact_field"
:
"A:ID-S3:Wig:01:Position:Readback"
,
"sul_
field
"
:
"A:ID-S2:Wig:01:Position:Readback"
,
"sul_
gap
"
:
"A:ID-S2:Wig:01:Position:Readback"
,
"rf_old"
:
"ACS:RFSG_D.01:frequency"
,
"rf"
:
"A:TI:SignGen:SR-01:Frequency"
,
"q1_old"
:
"ACS:PQ1_S.01:current"
,
...
...
@@ -241,11 +244,11 @@ class CassandraHelper(object):
else
:
return
ret
JSONData
=
List
[
Optional
[
Dict
[
str
,
Union
[
int
,
Dict
[
str
,
str
]]]]]
@
staticmethod
def
cassandra_json_to_timeseries
(
json_data
,
# type: List[Optional[Dict[str, Union[int, Dict[str, str]]]]]
):
# type: (...) -> NamedTuple("dataset", [List[datetime.datetime], List[Union[List[float], float]]])
def
cassandra_json_to_timeseries
(
json_data
):
# type: (JSONData) -> NamedTuple("dataset", [List[datetime.datetime], List[Union[List[float], float]]])
"""Return lists of timestamps and values for given Cassandra's JSON data.
Args:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment