Commit 974723b7 authored by Laurent Claustre's avatar Laurent Claustre Committed by Generic Bliss account for Control Software
Browse files

Tango: added support for new properties http_port and stream_port

parent 2aac22fd
Pipeline #25533 failed with stages
in 5 minutes and 13 seconds
......@@ -32,7 +32,7 @@ namespace Eiger
enum Status { Initializing, Ready, Armed, Exposure, Fault };
enum CompressionType {NoCompression,LZ4,BSLZ4};
Camera(const std::string& detector_ip, int http_port = 80, int stream_port = 9999);
Camera(const std::string& detector_ip, int http_port = 80, int stream_port = 9999) /KeywordArgs="Optional"/;
~Camera();
void initialize();
......
......@@ -197,6 +197,12 @@ class EigerClass(PyTango.DeviceClass):
'detector_ip_address':
[PyTango.DevString,
"Detector ip address",[]],
'http_port':
[PyTango.DevLong,
"HTTP port number",[]],
'stream_port':
[PyTango.DevLong,
"Stream port number",[]],
}
......@@ -309,7 +315,12 @@ def get_control(detector_ip_address = "0", **keys) :
global _EigerInterface
global _EigerCamera
if _EigerInterface is None:
_EigerCamera = EigerAcq.Camera(detector_ip_address)
http_port = keys.pop('http_port', 80)
stream_port = keys.pop('stream_port', 9999)
_EigerCamera = EigerAcq.Camera(detector_ip_address,
http_port=http_port,
stream_port=stream_port)
_EigerInterface = EigerAcq.Interface(_EigerCamera)
return Core.CtControl(_EigerInterface)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment