Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-pilatus
Commits
04b9561a
Commit
04b9561a
authored
Jul 03, 2020
by
bliss administrator
Browse files
Updated tango plugin:
* remove obsolete property TmpfsSize * add new properties for external computer
parent
d683abe2
Pipeline
#28790
failed with stages
in 3 minutes and 1 second
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tango/Pilatus.py
View file @
04b9561a
...
...
@@ -112,10 +112,6 @@ class Pilatus(PyTango.Device_4Impl):
self
.
set_state
(
PyTango
.
DevState
.
ON
)
self
.
get_device_properties
(
self
.
get_device_class
())
if
self
.
TmpfsSize
:
buffer
=
_PilatusInterface
.
buffer
()
buffer
.
setTmpfsSize
(
self
.
TmpfsSize
*
1024
*
1024
)
#------------------------------------------------------------------
# getAttrStringValueList command:
#
...
...
@@ -296,9 +292,21 @@ class PilatusClass(PyTango.DeviceClass):
# Device Properties
device_property_list
=
{
'
TmpfsSize
'
:
'
host_port
'
:
[
PyTango
.
DevInt
,
"Size of communication temp. filesystem (in MB)"
,
0
],
"detector computer host name"
,
4123
],
'host_name'
:
[
PyTango
.
DevString
,
"detector computer host name"
,
"localhost"
],
'config_file'
:
[
PyTango
.
DevString
,
"detector config path to get frame dimensions"
,
"/home/det/p2_det/config/cam_data/camera.def"
],
'tmpfs_path'
:
[
PyTango
.
DevString
,
"temporary file-system path to let camserver stores images"
,
"/lima_data"
],
}
# Command definitions
...
...
@@ -371,7 +379,14 @@ def get_control(**keys) :
global
_PilatusCamera
global
_CtControl
if
_PilatusInterface
is
None
:
_PilatusCamera
=
PilatusAcq
.
Camera
()
host_name
=
keys
.
pop
(
'host_name'
,
'localhost'
)
host_port
=
keys
.
pop
(
'host_port'
,
41234
)
config_file
=
keys
.
pop
(
'config_file'
,
'/home/det/p2_det/config/cam_data/camera_def'
)
tmpfs_path
=
keys
.
pop
(
'tmpfs_path'
,
'/lima_data'
)
_PilatusCamera
=
PilatusAcq
.
Camera
(
host_name
=
host_name
,
host_port
=
host_port
,
config_file
=
config_file
,
tmpfs_path
=
tmpfs_path
)
_PilatusInterface
=
PilatusAcq
.
Interface
(
_PilatusCamera
)
_CtControl
=
Core
.
CtControl
(
_PilatusInterface
)
return
_CtControl
...
...
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