detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-16 23:58:41 +01:00
Code Issues Actions Packages Releases Activity

udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-13 15:34:53 +00:00
parent d205e79106
commit 1882454cf3
7 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -2968,7 +2968,6 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
dacIndex dac;
dacs_t val=-1;
char answer[1000];
if (cmd=="vthreshold")
dac=THRESHOLD;
else if (cmd=="vcalibration")
@@ -3007,15 +3006,7 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
dac=G_VREF_COMP;
else if (cmd=="ib_test_c")
dac=G_IB_TESTC;
else if (cmd=="temp_adc") {
dac=TEMPERATURE_ADC;
if (action==PUT_ACTION)
return string("cannot set ")+cmd;
} else if (cmd=="temp_fpga") {
dac=TEMPERATURE_FPGA;
if (action==PUT_ACTION)
return string("cannot set ")+cmd;
} else
else
return string("cannot decode dac ")+cmd;
if (action==PUT_ACTION) {
@@ -3144,6 +3135,8 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action) {
#else
sprintf(answer,"%f",myDet->getADC(adc));
#endif
if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA))
strcat(answer,"°C");
return string(answer);
}