detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

Dev/zmq stream all ipv6 adn remove rx_zmqip (#958)

Browse Source 
* enable ipv6 in zmq socket

* removed rx_zmqip API and field in gui, changed client updaterxrzip to updateclientzmqip to have the rx_hostname ip if 0. 

* updated command line for rx_zmqip to give a warning. 

* Replaced 'depreciated' to 'deprecated' everywhere

* switching from * to 0.0.0.0 works for rebinding zmq sockets

* fixed help in command line for rx_zmqip * to 0.0.0.0 and removed cmd in python

* remove publisher zmq socket ip also for moench post processing

* fixed tests

* publisher zmq ip macros to be reused
This commit is contained in:
maliakal_d
2024-09-10 15:19:08 +02:00
committed by GitHub
parent 15e8c0d9f1
commit e848293916
35 changed files with 168 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/generator/Caller.in.h
View File

@ -66,7 +66,7 @@ class Caller {
int rx_id{-1};
private:
bool ReplaceIfDepreciated(std::string &command);
bool ReplaceIfDeprecated(std::string &command);
using FunctionMap = std::map<std::string, std::string (Caller::*)(int)>;
using StringMap = std::map<std::string, std::string>;
Detector *ptr; // pointer to the detector that executes the command
@ -81,7 +81,7 @@ class Caller {
};
StringMap depreciated_functions{
StringMap deprecated_functions{
// THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (3)

5
slsDetectorSoftware/generator/autocomplete/bash_autocomplete.sh
View File

@ -2111,11 +2111,6 @@ return 0
}
__rx_zmqip() {
FCN_RETURN=""
if [[ ${IS_GET} -eq 0 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
fi
fi
return 0
}
__rx_zmqport() {

5
slsDetectorSoftware/generator/autocomplete/zsh_autocomplete.sh
View File

@ -2035,11 +2035,6 @@ return 0
}
__rx_zmqip() {
FCN_RETURN=""
if [[ ${IS_GET} -eq 0 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
fi
fi
return 0
}
__rx_zmqport() {

28
slsDetectorSoftware/generator/commands.yaml
View File

@ -1041,18 +1041,6 @@ rx_zmqstartfnum:
PUT:
function: setRxZmqStartingFrame
rx_zmqip:
help: "[x.x.x.x]\n\tZmq Ip Address from which data is to be streamed out of the receiver. Also restarts receiver zmq streaming if enabled. Default is from rx_hostname. Modified only when using an intermediate process between receiver."
inherit_actions: INTEGER_COMMAND_VEC_ID
actions:
GET:
function: getRxZmqIP
PUT:
function: setRxZmqIP
input_types: [ IpAddr ]
input: [ 'IpAddr(args[0])' ]
cast_input: [ false ]
zmqip:
help: "[x.x.x.x]\n\tIp Address to listen to zmq data streamed out from receiver or intermediate process. Default connects to receiver zmq Ip Address (from rx_hostname). Modified only when using an intermediate process between receiver and client(gui). Also restarts client zmq streaming if enabled."
inherit_actions: INTEGER_COMMAND_VEC_ID
@ -2578,6 +2566,14 @@ rx_hostname:
PUT:
argc: -1
rx_zmqip:
is_description: true
actions:
GET:
argc: 0
PUT:
argc: -1
rx_roi:
is_description: true
actions:
@ -3936,7 +3932,7 @@ patloop:
output: [level,"' '" , "'['" , "ToStringHex(start, 4)" , '", "' , "ToStringHex(stop, 4)", "']'" ]
patloop0:
help: "Depreciated command. Use patloop."
help: "Deprecated command. Use patloop."
inherit_actions: patloop
actions:
GET:
@ -3983,7 +3979,7 @@ patnloop:
output: [ level,"' '" , nloops ]
patnloop0:
help: "Depreciated command. Use patnloop."
help: "Deprecated command. Use patnloop."
inherit_actions: patnloop
actions:
GET:
@ -4029,7 +4025,7 @@ patwait:
output: [level,"' '" , "ToStringHex(addr, 4)" ]
patwait0:
help: "Depreciated command. Use patwait."
help: "Deprecated command. Use patwait."
inherit_actions: patwait
actions:
GET:
@ -4075,7 +4071,7 @@ patwaittime:
output: [level,"' '" , "waittime" ]
patwaittime0:
help: "Depreciated command. Use patwaittime."
help: "Deprecated command. Use patwaittime."
inherit_actions: patwaittime
actions:
GET:

58
slsDetectorSoftware/generator/extended_commands.yaml
View File

@ -5994,7 +5994,7 @@ patloop0:
store_result_in_t: false
command_name: patloop0
function_alias: patloop0
help: Depreciated command. Use patloop.
help: Deprecated command. Use patloop.
infer_action: true
patloop1:
actions:
@ -6063,7 +6063,7 @@ patloop1:
store_result_in_t: false
command_name: patloop1
function_alias: patloop1
help: Depreciated command. Use patloop.
help: Deprecated command. Use patloop.
infer_action: true
patloop2:
actions:
@ -6132,7 +6132,7 @@ patloop2:
store_result_in_t: false
command_name: patloop2
function_alias: patloop2
help: Depreciated command. Use patloop.
help: Deprecated command. Use patloop.
infer_action: true
patmask:
actions:
@ -6293,7 +6293,7 @@ patnloop0:
store_result_in_t: false
command_name: patnloop0
function_alias: patnloop0
help: Depreciated command. Use patnloop.
help: Deprecated command. Use patnloop.
infer_action: true
patnloop1:
actions:
@ -6351,7 +6351,7 @@ patnloop1:
store_result_in_t: false
command_name: patnloop1
function_alias: patnloop1
help: Depreciated command. Use patnloop.
help: Deprecated command. Use patnloop.
infer_action: true
patnloop2:
actions:
@ -6409,7 +6409,7 @@ patnloop2:
store_result_in_t: false
command_name: patnloop2
function_alias: patnloop2
help: Depreciated command. Use patnloop.
help: Deprecated command. Use patnloop.
infer_action: true
patsetbit:
actions:
@ -6616,7 +6616,7 @@ patwait0:
store_result_in_t: false
command_name: patwait0
function_alias: patwait0
help: Depreciated command. Use patwait.
help: Deprecated command. Use patwait.
infer_action: true
patwait1:
actions:
@ -6674,7 +6674,7 @@ patwait1:
store_result_in_t: false
command_name: patwait1
function_alias: patwait1
help: Depreciated command. Use patwait.
help: Deprecated command. Use patwait.
infer_action: true
patwait2:
actions:
@ -6732,7 +6732,7 @@ patwait2:
store_result_in_t: false
command_name: patwait2
function_alias: patwait2
help: Depreciated command. Use patwait.
help: Deprecated command. Use patwait.
infer_action: true
patwaittime:
actions:
@ -6853,7 +6853,7 @@ patwaittime0:
store_result_in_t: false
command_name: patwaittime0
function_alias: patwaittime0
help: Depreciated command. Use patwaittime.
help: Deprecated command. Use patwaittime.
infer_action: true
patwaittime1:
actions:
@ -6911,7 +6911,7 @@ patwaittime1:
store_result_in_t: false
command_name: patwaittime1
function_alias: patwaittime1
help: Depreciated command. Use patwaittime.
help: Deprecated command. Use patwaittime.
infer_action: true
patwaittime2:
actions:
@ -6969,7 +6969,7 @@ patwaittime2:
store_result_in_t: false
command_name: patwaittime2
function_alias: patwaittime2
help: Depreciated command. Use patwaittime.
help: Deprecated command. Use patwaittime.
infer_action: true
patword:
actions:
@ -9250,38 +9250,30 @@ rx_zmqip:
cast_input: []
check_det_id: false
convert_det_id: true
function: getRxZmqIP
function: ''
input: []
input_types: []
output:
- OutString(t)
require_det_id: true
output: []
require_det_id: false
store_result_in_t: true
PUT:
args:
- arg_types:
- IpAddr
argc: 1
cast_input:
- false
- arg_types: []
argc: -1
cast_input: []
check_det_id: false
convert_det_id: true
function: setRxZmqIP
input:
- IpAddr(args[0])
input_types:
- IpAddr
output:
- args.front()
require_det_id: true
function: ''
input: []
input_types: []
output: []
require_det_id: false
store_result_in_t: false
command_name: rx_zmqip
function_alias: rx_zmqip
help: "[x.x.x.x]\n\tZmq Ip Address from which data is to be streamed out of the\
\ receiver. Also restarts receiver zmq streaming if enabled. Default is from rx_hostname.\
\ Modified only when using an intermediate process between receiver."
help: ''
infer_action: true
template: true
is_description: true
rx_zmqport:
actions:
GET: