detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-06-06 19:48:44 +02:00
Code Issues Actions Packages Releases Activity

wip
Build on RHEL9 docker image / build (push) Successful in 3m31s
Details
Build on RHEL8 docker image / build (push) Successful in 4m47s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-03-19 17:28:29 +01:00
parent 01d90b8ba2
commit ff0b3e1274
5 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/generator/autocomplete/bash_autocomplete.sh
+2 -2
View File
@@ -1895,12 +1895,12 @@ __powername() {
FCN_RETURN=""
if [[ ${IS_GET} -eq 1 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
FCN_RETURN="v_a v_b v_c v_chip v_d v_io"
fi
fi
if [[ ${IS_GET} -eq 0 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
FCN_RETURN="v_a v_b v_c v_chip v_d v_io"
fi
if [[ "${cword}" == "3" ]]; then
FCN_RETURN=""
slsDetectorSoftware/generator/autocomplete/zsh_autocomplete.sh
+2 -2
View File
@@ -1819,12 +1819,12 @@ __powername() {
FCN_RETURN=""
if [[ ${IS_GET} -eq 1 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
FCN_RETURN="v_a v_b v_c v_chip v_d v_io"
fi
fi
if [[ ${IS_GET} -eq 0 ]]; then
if [[ "${cword}" == "2" ]]; then
FCN_RETURN=""
FCN_RETURN="v_a v_b v_c v_chip v_d v_io"
fi
if [[ "${cword}" == "3" ]]; then
FCN_RETURN=""
slsDetectorSoftware/generator/commands.yaml
+3 -6
View File
@@ -2275,19 +2275,15 @@ powername:
argc: 1
check_det_id: true
function: getPowerName
input: [ 'args[0]' ]
arg_types: [ std::string ]
input: [ 'static_cast<defs::powerIndex>(StringTo<int>(args[0]))' ]
input_types: [ defs::powerIndex ]
cast_input: [ true ]
output: [ 'args[0]',"' '", 't' ]
PUT:
argc: 2
check_det_id: true
function: setPowerName
input: [ 'args[0]', 'args[1]' ]
arg_types: [ std::string, std::string ]
input: [ 'static_cast<defs::powerIndex>(StringTo<int>(args[0]))', 'args[1]' ]
input_types: [ defs::powerIndex, std::string ]
cast_input: [ true, false ]
output: [ 'ToString(args)' ]
@@ -2808,6 +2804,7 @@ powervalues:
args:
- argc: 0
################# special commands ##########################
virtual:
slsDetectorSoftware/generator/extended_commands.yaml
+6 -6
View File
@@ -7434,15 +7434,15 @@ powername:
GET:
args:
- arg_types:
- std::string
- defs::powerIndex
argc: 1
cast_input:
- true
- false
check_det_id: true
convert_det_id: true
function: getPowerName
input:
- args[0]
- static_cast<defs::powerIndex>(StringTo<int>(args[0]))
input_types:
- defs::powerIndex
output:
@@ -7454,17 +7454,17 @@ powername:
PUT:
args:
- arg_types:
- std::string
- defs::powerIndex
- std::string
argc: 2
cast_input:
- true
- false
- false
check_det_id: true
convert_det_id: true
function: setPowerName
input:
- args[0]
- static_cast<defs::powerIndex>(StringTo<int>(args[0]))
- args[1]
input_types:
- defs::powerIndex
slsDetectorSoftware/src/Caller.cpp
+4 -16
View File
@@ -9034,12 +9034,6 @@ std::string Caller::powername(int action) {
}
if (args.size() == 1) {
try {
StringTo<defs::powerIndex>(args[0]);
} catch (...) {
throw RuntimeError(
"Could not convert argument 0 to defs::powerIndex");
}
}
}
@@ -9050,12 +9044,6 @@ std::string Caller::powername(int action) {
}
if (args.size() == 2) {
try {
StringTo<defs::powerIndex>(args[0]);
} catch (...) {
throw RuntimeError(
"Could not convert argument 0 to defs::powerIndex");
}
}
}
@@ -9072,8 +9060,8 @@ std::string Caller::powername(int action) {
if (det_id != -1) {
throw RuntimeError("Cannot execute powername at module level");
}
auto arg0 = StringTo<defs::powerIndex>(args[0]);
auto t = det->getPowerName(arg0);
auto t = det->getPowerName(
static_cast<defs::powerIndex>(StringTo<int>(args[0])));
os << args[0] << ' ' << t << '\n';
}
}
@@ -9083,8 +9071,8 @@ std::string Caller::powername(int action) {
if (det_id != -1) {
throw RuntimeError("Cannot execute powername at module level");
}
auto arg0 = StringTo<defs::powerIndex>(args[0]);
det->setPowerName(arg0, args[1]);
det->setPowerName(
static_cast<defs::powerIndex>(StringTo<int>(args[0])), args[1]);
os << ToString(args) << '\n';
}
}