Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Benoit Rousselle
bliss
Commits
2d1a771a
Commit
2d1a771a
authored
Mar 25, 2019
by
Linus Pithan
Browse files
black
parent
0a6c0fa7
Changes
2
Hide whitespace changes
Inline
Side-by-side
bliss/common/measurement.py
View file @
2d1a771a
...
...
@@ -19,17 +19,17 @@ from bliss.common.alias import AliasMixin
# Counter namespaces
class
IterableNamespace
(
SimpleNamespace
):
def
__init__
(
self
,
**
kwargs
):
def
__init__
(
self
,
**
kwargs
):
super
().
__init__
(
**
kwargs
)
def
__getitem__
(
self
,
key
):
def
__getitem__
(
self
,
key
):
return
self
.
__dict__
.
__getitem__
(
key
)
def
__iter__
(
self
):
return
self
.
__dict__
.
values
().
__iter__
()
@
property
def
_fields
(
self
):
def
_fields
(
self
):
return
list
(
self
.
__dict__
.
keys
())
...
...
bliss/controllers/lima/lima_base.py
View file @
2d1a771a
...
...
@@ -343,9 +343,9 @@ class Lima(object):
# All ROI counters
dct
[
"roi_counters"
]
=
counter_namespace
(
self
.
roi_counters
.
counters
)
# Default grouped
default_counters
=
{
**
dct
[
"images"
].
__dict__
,
**
dct
[
"roi_counters"
].
__dict__
}
default_counters
=
{
**
dct
[
"images"
].
__dict__
,
**
dct
[
"roi_counters"
].
__dict__
}
dct
[
"default"
]
=
namespace
(
default_counters
)
# Return namespace
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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