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

changed sscanf for double from %f to %lf in slsdetcommand.cpp and fileio.cpp

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@213 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-08-03 10:05:37 +00:00
parent 71339022cf
commit b154207535
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1442,7 +1442,7 @@ string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action){
char answer[1000]; char answer[1000];
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
sscanf(args[1],"%f",&fval); sscanf(args[1],"%lf",&fval);
myDet->setRateCorrection(fval); myDet->setRateCorrection(fval);
} }
double t; double t;
@ -1576,7 +1576,7 @@ string slsDetectorCommand::cmdAngConv(int narg, char *args[], int action){
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (sscanf(args[1],"%f",&fval)) if (sscanf(args[1],"%lf",&fval))
myDet->setAngularConversionParameter(c,fval); myDet->setAngularConversionParameter(c,fval);
} }
sprintf(answer,"%f",myDet->getAngularConversionParameter(c)); sprintf(answer,"%f",myDet->getAngularConversionParameter(c));
@ -1770,7 +1770,7 @@ string slsDetectorCommand::cmdPositions(int narg, char *args[], int action){
double pos[ival]; double pos[ival];
for (ip=0; ip<ival;ip++) { for (ip=0; ip<ival;ip++) {
if ((2+ip)<narg) { if ((2+ip)<narg) {
if (sscanf(args[2+ip],"%f",pos+ip)) { if (sscanf(args[2+ip],"%lf",pos+ip)) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "Setting position " << ip <<" to " << pos[ip] << std::endl; std::cout<< "Setting position " << ip <<" to " << pos[ip] << std::endl;
#endif #endif
@ -1897,7 +1897,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
values=new double[ival]; values=new double[ival];
for (int i=0; i<ival; i++) { for (int i=0; i<ival; i++) {
if (narg>=(i+2)) { if (narg>=(i+2)) {
if (sscanf(args[i+2],"%f",values+i)) if (sscanf(args[i+2],"%lf",values+i))
ns++; ns++;
else else
break; break;
@ -1931,15 +1931,15 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
if (narg<4) if (narg<4)
return string("wrong number of arguments ")+helpScans(narg,args,action); return string("wrong number of arguments ")+helpScans(narg,args,action);
if (sscanf(args[1],"%f",&fmin)) if (sscanf(args[1],"%lf",&fmin))
; ;
else else
return string("invalid scan minimum")+string(args[1]); return string("invalid scan minimum")+string(args[1]);
if (sscanf(args[2],"%f",&fmax)) if (sscanf(args[2],"%lf",&fmax))
; ;
else else
return string("invalid scan maximum")+string(args[2]); return string("invalid scan maximum")+string(args[2]);
if (sscanf(args[3],"%f",&fstep)) if (sscanf(args[3],"%lf",&fstep))
; ;
else else
return string("invalid scan step")+string(args[3]); return string("invalid scan step")+string(args[3]);
@ -2691,7 +2691,7 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
return string("cannot decode dac ")+cmd; return string("cannot decode dac ")+cmd;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (sscanf(args[1],"%f", &val)) if (sscanf(args[1],"%lf", &val))
; ;
else else
return string("cannot scan DAC value ")+string(args[1]); return string("cannot scan DAC value ")+string(args[1]);
@ -2882,7 +2882,7 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) {
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (sscanf(args[1],"%f", &val)) if (sscanf(args[1],"%lf", &val))
; ;
else else
return string("cannot scan timer value ")+string(args[1]); return string("cannot scan timer value ")+string(args[1]);

4
slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
View File

@ -152,7 +152,7 @@ int fileIO::getVariablesFromFileName(string fname, int &index, int &p_index, dou
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"s%f",&f)) { if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"s%lf",&f)) {
sv1=f; sv1=f;
#ifdef VERBOSE #ifdef VERBOSE
cout << "******************************** scan variable 1 is " << sv1 << endl; cout << "******************************** scan variable 1 is " << sv1 << endl;
@ -173,7 +173,7 @@ int fileIO::getVariablesFromFileName(string fname, int &index, int &p_index, dou
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"S%f",&f)) { if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"S%lf",&f)) {
sv0=f; sv0=f;
#ifdef VERBOSE #ifdef VERBOSE
cout << "******************************** scan variable 0 is " << sv0 << endl; cout << "******************************** scan variable 0 is " << sv0 << endl;