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

reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings

Browse Source
This commit is contained in:
maliakal_d
2019-02-14 17:43:28 +01:00
parent d2ba206216
commit 722883531d
7 changed files with 0 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1956,28 +1956,6 @@ std::string multiSlsDetector::getAdditionalJsonParameter(const std::string& key,
return sls::concatenateIfDifferent(r);
}
int multiSlsDetector::setAdditionalJsonSpecificParameter(jsonHeaderParameterType mode, int value, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setAdditionalJsonSpecificParameter(mode, value);
}
// multi
auto r = parallelCall(&slsDetector::setAdditionalJsonSpecificParameter, mode, value);
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::getAdditionalJsonSpecificParameter(jsonHeaderParameterType mode, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->getAdditionalJsonSpecificParameter(mode);
}
// multi
auto r = serialCall(&slsDetector::getAdditionalJsonSpecificParameter, mode);
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::setReceiverUDPSocketBufferSize(int udpsockbufsize, int detPos) {
// single
if (detPos >= 0) {

17
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1087,23 +1087,6 @@ class multiSlsDetector : public virtual slsDetectorDefs,
*/
std::string getAdditionalJsonParameter(const std::string& key, int detPos = -1);
/**
* Sets the value for a specific additional json header parameter
* @param mode specific json header parameter (JSON_EMIN, JSON_EMAX, JSON_READOUT_MODE, JSON_DETECTOR_MODE)
* @param value to set the parameter to, json_readout_mode and json_detector_mode can have only have values from jsonReadoutModeType or jsonDetectorModeType
* @param detPos -1 for all detectors in list or specific detector position
* @returns the specific additional json header parameter value or enum
*/
int setAdditionalJsonSpecificParameter(jsonHeaderParameterType mode, int value, int detPos = -1);
/**
* Returns the specific additional json header parameter value
* @param mode specific json header parameter (JSON_EMIN, JSON_EMAX, JSON_READOUT_MODE, JSON_DETECTOR_MODE)
* @param detPos -1 for all detectors in list or specific detector position
* @returns the specific additional json header parameter value or enum
*/
int getAdditionalJsonSpecificParameter(jsonHeaderParameterType mode, int detPos = -1);
/**
* Sets the receiver UDP socket buffer size
* @param udpsockbufsize additional json header