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

fixed

Browse Source
This commit is contained in:
Erik Frojdh
2018-12-19 11:51:42 +01:00
parent 1af2d95462
commit 88b9a93b3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4022,8 +4022,8 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
// printf("chiptestboard!\n"); // printf("chiptestboard!\n");
adc=(dacIndex)(idac+1000); adc=(dacIndex)(idac+1000);
if (idac < SLOW_ADC0 || idac > SLOW_ADC_TEMP) if (idac < SLOW_ADC0 || idac > SLOW_ADC_TEMP)
return (string ("cannot set adc, must be between ") + (SLOW_ADC0 - 1000) + return (std::string ("cannot set adc, must be between ") + std::to_string(SLOW_ADC0 - 1000) +
string (" and ") + (SLOW_ADC_TEMP - 1000)); std::string (" and ") + std::to_string(SLOW_ADC_TEMP - 1000));
} else if (cmd=="temp_adc") } else if (cmd=="temp_adc")
adc=TEMPERATURE_ADC; adc=TEMPERATURE_ADC;
else if (cmd=="temp_fpga") else if (cmd=="temp_fpga")
@ -4063,7 +4063,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
else if (cmd=="i_io") else if (cmd=="i_io")
adc=I_POWER_IO; adc=I_POWER_IO;
else else
return string("cannot decode adc ")+cmd; return std::string("cannot decode adc ")+cmd;
myDet->setOnline(ONLINE_FLAG, detPos); myDet->setOnline(ONLINE_FLAG, detPos);
if (myDet->getDetectorsType(detPos) == EIGER || myDet->getDetectorsType(detPos) == JUNGFRAU){ if (myDet->getDetectorsType(detPos) == EIGER || myDet->getDetectorsType(detPos) == JUNGFRAU){
@ -4081,7 +4081,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
else else
strcat(answer,"mV"); strcat(answer,"mV");
return string(answer); return std::string(answer);
} }