detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-20 16:48:01 +02:00
Code Issues Actions Packages Releases Activity

mythen3 rxr

Browse Source
This commit is contained in:
maliakal_d
2019-11-08 18:11:27 +01:00
parent aaeaeab576
commit 38ad5d7931
8 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -1106,6 +1106,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
case JUNGFRAU:
case CHIPTESTBOARD:
case MOENCH:
case MYTHEN3:
FILE_LOG(logINFO) << " ***** " << sls::ToString(d)
<< " Receiver *****";
break;
@ -1131,6 +1132,9 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
case MOENCH:
generalData = new MoenchData();
break;
case MYTHEN3:
generalData = new Mythen3Data();
break;
default:
break;
}

21
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -472,6 +472,7 @@ int slsReceiverTCPIPInterface::set_detector_type(Interface &socket) {
case CHIPTESTBOARD:
case MOENCH:
case JUNGFRAU:
case MYTHEN3:
break;
default:
throw RuntimeError("Unknown detector type: " + std::to_string(arg));
@ -598,17 +599,21 @@ int slsReceiverTCPIPInterface::set_dynamic_range(Interface &socket) {
VerifyIdle(socket);
FILE_LOG(logDEBUG1) << "Setting dynamic range: " << dr;
bool exists = false;
switch (dr) {
case 16:
exists = true;
break;
case 4:
case 8:
case 32:
if (myDetectorType == EIGER)
switch(myDetectorType) {
case EIGER:
if (dr == 4 || dr == 8 || dr == 16 || dr == 32) {
exists = true;
}
break;
case MYTHEN3:
if (dr == 32) {
exists = true;
}
break;
default:
if (dr == 16) {
exists = true;
}
break;
}
if (!exists) {