mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-16 06:47:14 +02:00
ctb: patwaittime and exptime (#1076)
* cli: patwaittime also takes time argument, api: patwaitclocks and patwaitinterval, tcp: patwaitinterval is 2 functions for set and get, patwaitclocks remains a single for backward compatibility with -1 for get, server (loadpattern): clks using member names (needs to be refactored). needs tobe discussed what to do with pattern files. * all tests passed * fixed test * exptime deprecated for ctb and xilinx * pyctbgui..not there yet * fixed in pyctbgui * removed redundant warning for ctb and xilinx exptime in Detector class (already in module class handling all exptime signatures), patwait, patloop and patnloop have to be non inferrable commands because of support for old commands (level as suffix) * fix formatting error from command line parsing * fix tests for patwaittime
This commit is contained in:
@ -2012,29 +2012,13 @@ int InferAction::patlimits() {
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patloop() {
|
||||
int InferAction::patloop() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patloop. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patloop0() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patloop0() {
|
||||
int InferAction::patloop1() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patloop0. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patloop1() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patloop1. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patloop2() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patloop2. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patloop2() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patmask() {
|
||||
|
||||
@ -2052,29 +2036,13 @@ int InferAction::patmask() {
|
||||
}
|
||||
}
|
||||
|
||||
int InferAction::patnloop() {
|
||||
int InferAction::patnloop() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patnloop. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patnloop0() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patnloop0() {
|
||||
int InferAction::patnloop1() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patnloop0. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patnloop1() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patnloop1. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patnloop2() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patnloop2. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patnloop2() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patsetbit() {
|
||||
|
||||
@ -2116,29 +2084,13 @@ int InferAction::patternstart() {
|
||||
}
|
||||
}
|
||||
|
||||
int InferAction::patwait() {
|
||||
int InferAction::patwait() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwait. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patwait0() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patwait0() {
|
||||
int InferAction::patwait1() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwait0. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patwait1() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwait1. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patwait2() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwait2. Use "
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
int InferAction::patwait2() { throw RuntimeError("infer_action is disabled"); }
|
||||
|
||||
int InferAction::patwaittime() {
|
||||
|
||||
@ -2146,24 +2098,6 @@ int InferAction::patwaittime() {
|
||||
"sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patwaittime0() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwaittime0. "
|
||||
"Use sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patwaittime1() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwaittime1. "
|
||||
"Use sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patwaittime2() {
|
||||
|
||||
throw RuntimeError("sls_detector is disabled for command: patwaittime2. "
|
||||
"Use sls_detector_get or sls_detector_put");
|
||||
}
|
||||
|
||||
int InferAction::patword() {
|
||||
|
||||
if (args.size() == 1) {
|
||||
|
Reference in New Issue
Block a user