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

set dac should also return get dac

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@769 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-12 10:14:08 +00:00
parent 9e5ede1b38
commit 833dd75927
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -3275,6 +3275,8 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
else else
return string("cannot decode dac ")+cmd; return string("cannot decode dac ")+cmd;
myDet->setOnline(ONLINE_FLAG);
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
#ifdef DACS_INT #ifdef DACS_INT
if (sscanf(args[1],"%d", &val)) if (sscanf(args[1],"%d", &val))
@ -3284,13 +3286,14 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
; ;
else else
return string("cannot scan DAC value ")+string(args[1]); return string("cannot scan DAC value ")+string(args[1]);
myDet->setDAC(val,dac);
} }
myDet->setOnline(ONLINE_FLAG);
#ifdef DACS_INT #ifdef DACS_INT
sprintf(answer,"%d",myDet->setDAC(val,dac)); sprintf(answer,"%d",myDet->setDAC(-1,dac));
#else #else
sprintf(answer,"%f",myDet->setDAC(val,dac)); sprintf(answer,"%f",myDet->setDAC(-1,dac));
#endif #endif
return string(answer); return string(answer);