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

in between

Browse Source
This commit is contained in:
maliakal_d
2018-12-12 11:20:27 +01:00
parent 87f7563035
commit 79693a38f5
27 changed files with 1044 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2483,11 +2483,11 @@ int slsDetector::setDAC(int val, dacIndex index, int mV) {
int fnum = F_SET_DAC;
int ret = FAIL;
int args[3] = {(int)index, mV, val};
int retvals[2] = {-1, -1};
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting DAC " << index << " to " << val << (mV ? "mV" : "dac units");
if (thisDetector->onlineFlag == ONLINE_FLAG && connectControl() == OK) {
ret = thisDetectorControl->Client_Send(fnum, args, sizeof(args), retvals, sizeof(retvals));
ret = thisDetectorControl->Client_Send(fnum, args, sizeof(args), &retval, sizeof(retval));
disconnectControl();
// handle ret
@ -2495,14 +2495,12 @@ int slsDetector::setDAC(int val, dacIndex index, int mV) {
setErrorMask((getErrorMask())|(OTHER_ERROR_CODE));
else {
FILE_LOG(logDEBUG1) << "Dac index " << index << ": "
<< retvals[0] << " dac units (" << retvals[1] << "mV)";
<< retval << (mV ? "mV" : "dac units");
if (ret == FORCE_UPDATE)
ret = updateDetector();
}
}
if (mV)
return retvals[1];
return retvals[0];
return retval;
}

3
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4174,6 +4174,9 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int detPos
if (sscanf(args[0],"adc:%d",&idac)==1) {
// printf("chiptestboard!\n");
adc=(dacIndex)(idac+1000);
if (idac < SLOW_ADC0 || idac > SLOW_ADC_TEMP)
return (string ("cannot set adc, must be between ") + (SLOW_ADC0 - 1000) +
string (" and ") + (SLOW_ADC_TEMP - 1000));
} else if (cmd=="temp_adc")
adc=TEMPERATURE_ADC;
else if (cmd=="temp_fpga")