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

changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@223 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-15 17:12:20 +00:00
parent 5407fdcf6e
commit 3e8f1e22e9
9 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2638,7 +2638,7 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
return helpDAC(narg, args, action);
dacIndex dac;
double val=-1;
dacs_t val=-1;
char answer[1000];
if (cmd=="vthreshold")
@ -2691,15 +2691,22 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
return string("cannot decode dac ")+cmd;
if (action==PUT_ACTION) {
if (sscanf(args[1],"%lf", &val))
#ifdef DACS_INT
if (sscanf(args[1],"%d", &val))
#else
if (sscanf(args[1],"%f", &val))
#endif
;
else
return string("cannot scan DAC value ")+string(args[1]);
}
myDet->setOnline(ONLINE_FLAG);
#ifdef DACS_INT
sprintf(answer,"%d",myDet->setDAC(val,dac));
#else
sprintf(answer,"%f",myDet->setDAC(val,dac));
#endif
return string(answer);
}
@ -2804,8 +2811,11 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action) {
return string("cannot decode adc ")+cmd;
myDet->setOnline(ONLINE_FLAG);
#ifdef DACS_INT
sprintf(answer,"%d",myDet->getADC(adc));
#else
sprintf(answer,"%f",myDet->getADC(adc));
#endif
return string(answer);
}