detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02: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

2
slsReceiverSoftware/include/GeneralData.h
View File

@ -216,7 +216,7 @@ public:
*/
virtual void Print(TLogLevel level = logDEBUG1) const {
FILE_LOG(level) << "\n\nDetector Data Variables:";
FILE_LOG(level) << "myDetectorType: " << slsDetectorDefs::getDetectorType(myDetectorType);
FILE_LOG(level) << "myDetectorType: " << slsDetectorDefs::detectorTypeToString(myDetectorType);
FILE_LOG(level) << "Pixels X: " << nPixelsX;
FILE_LOG(level) << "Pixels Y: " << nPixelsY;
FILE_LOG(level) << "Empty Header: " << emptyHeader;

4
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -834,7 +834,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
case EIGER:
case CHIPTESTBOARD:
case JUNGFRAU:
FILE_LOG(logINFO) << " ***** " << getDetectorType(d) << " Receiver *****";
FILE_LOG(logINFO) << " ***** " << detectorTypeToString(d) << " Receiver *****";
break;
default:
FILE_LOG(logERROR) << "This is an unknown receiver type " << (int)d;
@ -895,7 +895,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
// check udp socket buffer size
setUDPSocketBufferSize(udpSocketBufferSize);
FILE_LOG(logDEBUG) << " Detector type set to " << getDetectorType(d);
FILE_LOG(logDEBUG) << " Detector type set to " << detectorTypeToString(d);
return OK;
}