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
cfel-sc-public
Kamzik3
Commits
bac20647
Commit
bac20647
authored
May 20, 2022
by
Jerome Carnis
🦊
Browse files
deviceEigerP11.py: fix macroserver type
parent
b4a0fdad
Changes
1
Hide whitespace changes
Inline
Side-by-side
kamzik3/devices/deviceEigerP11.py
View file @
bac20647
...
...
@@ -4,7 +4,7 @@ import os
import
time
from
time
import
sleep
from
threading
import
Thread
from
typing
import
Any
,
Dict
,
List
,
Optional
,
Tuple
,
Union
from
typing
import
Any
,
cast
,
Dict
,
List
,
Optional
,
Tuple
,
Union
import
numpy
as
np
...
...
@@ -28,6 +28,7 @@ from kamzik3.devices.device import Device
from
kamzik3.devices.deviceTango
import
DeviceTango
from
kamzik3.devices.general.deviceScanner
import
DeviceScanner
from
kamzik3.macro.macro
import
Macro
from
kamzik3.macro.macroServer
import
MacroServer
from
kamzik3.macro.scan
import
Scan
from
kamzik3.macro.step
import
Step
,
StepDeviceMethod
from
kamzik3.snippets.snippetsDecorators
import
expose_method
...
...
@@ -398,7 +399,7 @@ class EigerSwScanner(DeviceScanner):
raise
DeviceError
(
"kamzik session is None, can't get the device MacroServer"
)
macro_server
=
kamzik3
.
session
.
get_device
(
"MacroServer"
)
macro_server
=
cast
(
MacroServer
,
kamzik3
.
session
.
get_device
(
"MacroServer"
)
)
current_scan_count
=
macro_server
.
get_macro_count
()
if
current_scan_count
!=
self
.
last_scan_count
:
self
.
_init_new_scan
(
scanner_input
,
scanner_attributes
,
parent_macro
)
...
...
@@ -420,7 +421,7 @@ class EigerSwScanner(DeviceScanner):
kamzik3
.
session
.
get_value
(
ATTR_SCAN_COUNT
)
)
)
macro_server
=
kamzik3
.
session
.
get_device
(
"MacroServer"
)
macro_server
=
cast
(
MacroServer
,
kamzik3
.
session
.
get_device
(
"MacroServer"
)
)
scan_prefix
=
macro_server
.
get_value
(
ATTR_MACRO_PREFIX
)
scan_count
=
macro_server
.
get_macro_count
()
scan_dir_name
=
"{}_{}"
.
format
(
scan_prefix
,
scan_count
-
1
)
...
...
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