detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 09:52:34 +01:00
Code Issues Actions Packages Releases Activity

new getDetectorType functions

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-18 10:53:49 +01:00
parent 13d6d3f866
commit 10539f8533
10 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -3295,7 +3295,7 @@ std::string slsDetectorCommand::cmdSettings(int narg, char *args[], int action,
if (sett == -1)
return std::string("unknown settings scanned " + std::string(args[1]));
sett = myDet->setSettings(sett, detPos);
if (myDet->getDetectorsType(detPos) == EIGER) {
if (myDet->getDetectorTypeAsEnum(detPos) == EIGER) {
return myDet->getDetectorSettings(sett);
}
}
@@ -3305,7 +3305,7 @@ std::string slsDetectorCommand::cmdSettings(int narg, char *args[], int action,
if (!sscanf(args[1], "%d", &val)) {
return std::string("invalid threshold value");
}
detectorType type = myDet->getDetectorsType(detPos);
detectorType type = myDet->getDetectorTypeAsEnum(detPos);
if (type != EIGER || (type == EIGER && narg <= 2)) {
myDet->setThresholdEnergy(val, GET_SETTINGS, 1, detPos);
} else {
@@ -3322,7 +3322,7 @@ std::string slsDetectorCommand::cmdSettings(int narg, char *args[], int action,
if (!sscanf(args[1], "%d", &val)) {
return std::string("invalid threshold value");
}
detectorType type = myDet->getDetectorsType(detPos);
detectorType type = myDet->getDetectorTypeAsEnum(detPos);
if (type != EIGER)
return std::string("not implemented for this detector");
if (narg <= 2) {
@@ -4049,7 +4049,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
return std::string("cannot decode adc ") + cmd;
myDet->setOnline(ONLINE_FLAG, detPos);
if (myDet->getDetectorsType(detPos) == EIGER || myDet->getDetectorsType(detPos) == JUNGFRAU) {
if (myDet->getDetectorTypeAsEnum(detPos) == EIGER || myDet->getDetectorTypeAsEnum(detPos) == JUNGFRAU) {
int val = myDet->getADC(adc, detPos);
if (val == -1)
sprintf(answer, "%d", val);
@@ -4106,7 +4106,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
return std::string("cannot decode adc ")+cmd;
myDet->setOnline(ONLINE_FLAG, detPos);
if (myDet->getDetectorsType(detPos) == EIGER || myDet->getDetectorsType(detPos) == JUNGFRAU){
if (myDet->getDetectorTypeAsEnum(detPos) == EIGER || myDet->getDetectorTypeAsEnum(detPos) == JUNGFRAU){
int val = myDet->getADC(adc, detPos);
if (val == -1)
sprintf(answer,"%d",val);