diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 568857964..76c6d382a 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -1442,7 +1442,7 @@ string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action){ char answer[1000]; if (action==PUT_ACTION) { - sscanf(args[1],"%f",&fval); + sscanf(args[1],"%lf",&fval); myDet->setRateCorrection(fval); } double t; @@ -1576,7 +1576,7 @@ string slsDetectorCommand::cmdAngConv(int narg, char *args[], int action){ if (action==PUT_ACTION) { - if (sscanf(args[1],"%f",&fval)) + if (sscanf(args[1],"%lf",&fval)) myDet->setAngularConversionParameter(c,fval); } sprintf(answer,"%f",myDet->getAngularConversionParameter(c)); @@ -1770,7 +1770,7 @@ string slsDetectorCommand::cmdPositions(int narg, char *args[], int action){ double pos[ival]; for (ip=0; ip=(i+2)) { - if (sscanf(args[i+2],"%f",values+i)) + if (sscanf(args[i+2],"%lf",values+i)) ns++; else break; @@ -1931,15 +1931,15 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) { if (narg<4) return string("wrong number of arguments ")+helpScans(narg,args,action); - if (sscanf(args[1],"%f",&fmin)) + if (sscanf(args[1],"%lf",&fmin)) ; else return string("invalid scan minimum")+string(args[1]); - if (sscanf(args[2],"%f",&fmax)) + if (sscanf(args[2],"%lf",&fmax)) ; else return string("invalid scan maximum")+string(args[2]); - if (sscanf(args[3],"%f",&fstep)) + if (sscanf(args[3],"%lf",&fstep)) ; else 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; if (action==PUT_ACTION) { - if (sscanf(args[1],"%f", &val)) + if (sscanf(args[1],"%lf", &val)) ; else 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 (sscanf(args[1],"%f", &val)) + if (sscanf(args[1],"%lf", &val)) ; else return string("cannot scan timer value ")+string(args[1]); diff --git a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp index 0b1ea91d9..dbd1cd4f5 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp @@ -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; #ifdef VERBOSE 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; #ifdef VERBOSE cout << "******************************** scan variable 0 is " << sv0 << endl;