string length on the scansteps command corrected

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@143 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp

@@ -655,25 +655,72 @@ string slsDetectorCommand::helpLine(int narg, char *args[], int action) {
   if (action==READOUT_ACTION) {
     return helpAcquire(narg,args,HELP_ACTION);
   }
-  os << helpAcquire(narg,args,action);
+
-  os << helpData(narg,args,action);
+
-  os << helpFrame(narg,args,action);
+  if (narg==0) {
-  os << helpStatus(narg,args,action);
+    os << "Command can be: " << endl;
-  os << helpFree(narg,args,action);
+    for(int i=0; i<numberOfCommands; ++i) {  
-  os << helpAdd(narg,args,action);
+      os << descrToFuncMap[i].m_pFuncName << "\t" ;
-  os << helpRemove(narg,args,action);
+    }
-  os << helpHostname(narg,args,action);
+    os << endl;
-  os << helpId(narg,args,action);
+    return os.str();
-  os << helpMaster(narg,args,action);
+  }
-  os << helpSync(narg,args,action);
+
-  os << helpExitServer(narg,args,action);
+  return executeLine(narg,args,HELP_ACTION);
-  os << helpSettingsDir(narg,args,action);
+
-  os << helpCalDir(narg,args,action);
+
-  os << helpOutDir(narg,args,action);
+
-  os << helpFileName(narg,args,action);
+
-  os << helpFileIndex(narg,args,action);
+
+
+//   os << helpAcquire(narg,args,action) << endl;
   
-  return os.str();
+//   os << helpData(narg,args,action) << endl;
+//   os << helpFrame(narg,args,action) << endl;
+//   os << helpStatus(narg,args,action) << endl;
+//   os << helpFree(narg,args,action) << endl;
+//   os << helpAdd(narg,args,action) << endl;
+//   os << helpRemove(narg,args,action) << endl;
+//   os << helpHostname(narg,args,action) << endl;
+//   os << helpId(narg,args,action) << endl;
+//   os << helpMaster(narg,args,action) << endl;
+//   os << helpSync(narg,args,action) << endl;
+//   os << helpExitServer(narg,args,action) << endl;
+//   os << helpSettingsDir(narg,args,action) << endl;
+//   os << helpCalDir(narg,args,action) << endl;
+//   os << helpOutDir(narg,args,action) << endl;
+//   os << helpFileName(narg,args,action) << endl;
+//   os << helpFileIndex(narg,args,action) << endl;
+//   os << helpFlatField(narg,args,action) << endl;
+//   os << helpRateCorr(narg,args,action) << endl;
+//    os << helpBadChannels(narg,args,action) << endl;
+//    os << helpAngConv(narg,args,action) << endl;
+//    os << helpThreaded(narg,args,action) << endl;
+//    os << helpPositions(narg,args,action) << endl;
+//    os << helpScripts(narg,args,action) << endl;
+//    os << helpScans(narg,args,action) << endl;
+//    os << helpNetworkParameter(narg,args,action) << endl;
+//    os << helpPort(narg,args,action) << endl;
+//    os << helpLock(narg,args,action) << endl;
+//    os << helpLastClient(narg,args,action) << endl;
+//    os << helpOnline(narg,args,action) << endl;
+//    os << helpConfigureMac(narg,args,action) << endl;
+//    os << helpDetectorSize(narg,args,action) << endl;
+//    os << helpSettings(narg,args,action) << endl;
+//    os << helpSN(narg,args,action) << endl;
+//    os << helpDigiTest(narg,args,action) << endl;
+//    os << helpRegister(narg,args,action) << endl;
+//    os << helpDAC(narg,args,action) << endl;
+//    os << helpTimer(narg,args,action) << endl;
+//    os << helpTiming(narg,args,action) << endl;
+//    os << helpTimeLeft(narg,args,action) << endl;
+//    os << helpSpeed(narg,args,action) << endl;
+//    os << helpAdvanced(narg,args,action) << endl;
+//    os << helpConfiguration(narg,args,action) << endl;
+//    os << helpImage(narg,args,action) << endl;
+//    os << helpADC(narg,args,action) << endl;
+  
+//   return os.str();
 }
 
 
@@ -1716,7 +1763,7 @@ string slsDetectorCommand::helpScripts(int narg, char *args[], int action) {
 string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 
   int is=-1, ival, ns=0;
-  char answer[1000];
+  char answer[MAX_STR_LENGTH*10];
   float *values;
   if (action==HELP_ACTION)
     return helpScans(narg,args,action);
@@ -1752,6 +1799,10 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 
     if (action==PUT_ACTION) {
       if (sscanf(args[1],"%d",&ival)) {
+      
+	if (ival>MAX_SCAN_STEPS)
+	  return string("too many steps required!");
+      
 	values=new float[ival];
 	for (int i=0; i<ival; i++) {
 	  if (narg>=(i+2)) {
@@ -1771,9 +1822,12 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
     ns=myDet->getScanSteps(is);
     values=new float[ns];
     ns=myDet->getScanSteps(is, values);
+    int p=myDet->getScanPrecision(is);
+    char format[1000];
+    sprintf(format, "%%s %%0.%df",p);
     sprintf(answer,"%d ",ns);
     for (int i=0; i<ns; i++) {
-      sprintf(answer,"%s %f",answer,values[i]);
+      sprintf(answer,format,answer,values[i]);
     }
     delete [] values;
     return string(answer);
@@ -1810,6 +1864,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
       ns=(int)((fmax-fmin)/fstep);
       if (ns<0)
 	ns=-1*ns;
+      ns++;
       
       if (ns>MAX_SCAN_STEPS)
 	return string("too many steps required!");
@@ -1834,9 +1889,12 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
     ns=myDet->getScanSteps(is);
     values=new float[ns];
     ns=myDet->getScanSteps(is, values);
+    int p=myDet->getScanPrecision(is);
+    char format[1000];
+    sprintf(format, "%%s %%0.%df",p);
     sprintf(answer,"%d ",ns);
     for (int i=0; i<ns; i++) {
-      sprintf(answer,"%s %f",answer,values[i]);
+      sprintf(answer,format,answer,values[i]);
     }
     delete [] values;
     return string(answer);

slsDetectorSoftware/slsDetector/slsDetectorCommand.h

@@ -34,7 +34,7 @@ class slsDetectorCommand {
 /*      \param os output stream to return the help to */
 /*      \param action can be PUT_ACTION or GET_ACTION (from text client even READOUT_ACTION for acquisition)  */
 /*   *\/ */
-   static string helpLine(int narg, char *args[], int action=HELP_ACTION); 
+   string helpLine(int narg, char *args[], int action=HELP_ACTION); 
    static string helpAcquire(int narg, char *args[], int action);
    static string helpData(int narg, char *args[], int action);
    static string helpFrame(int narg, char *args[], int action);
@@ -102,114 +102,51 @@ class slsDetectorCommand {
   slsDetectorBase *myDet;
    
    string cmdUnderDevelopment(int narg, char *args[], int action); 
-
    string cmdUnknown(int narg, char *args[], int action); 
-
    string cmdAcquire(int narg, char *args[], int action); 
-   
    string cmdData(int narg, char *args[], int action); 
-   
    string cmdFrame(int narg, char *args[], int action); 
-   
    string cmdStatus(int narg, char *args[], int action); 
-      
    string cmdFree(int narg, char *args[], int action);
-   
    string cmdAdd(int narg, char *args[], int action);
-
    string cmdRemove(int narg, char *args[], int action);
-
    string cmdHostname(int narg, char *args[], int action);
-
    string cmdId(int narg, char *args[], int action);
-
    string cmdMaster(int narg, char *args[], int action);
-
    string cmdSync(int narg, char *args[], int action);
-
    string cmdHelp(int narg, char *args[], int action);
-
    string cmdExitServer(int narg, char *args[], int action);
-
-
    string cmdSettingsDir(int narg, char *args[], int action);
-
    string cmdCalDir(int narg, char *args[], int action);
-
-
    string cmdTrimEn(int narg, char *args[], int action);
-
    string cmdOutDir(int narg, char *args[], int action);
-
    string cmdFileName(int narg, char *args[], int action);
-
-
    string cmdFileIndex(int narg, char *args[], int action);
    string cmdFlatField(int narg, char *args[], int action);
-
-
    string cmdRateCorr(int narg, char *args[], int action);
-
-
    string cmdBadChannels(int narg, char *args[], int action);
-
-
    string cmdAngConv(int narg, char *args[], int action);
-
    string cmdThreaded(int narg, char *args[], int action);
-
    string cmdPositions(int narg, char *args[], int action);
-
    string cmdScripts(int narg, char *args[], int action);
-
    string cmdScans(int narg, char *args[], int action);
-
-
    string cmdNetworkParameter(int narg, char *args[], int action);
-
    string cmdPort(int narg, char *args[], int action);
-
-
    string cmdLock(int narg, char *args[], int action);
-
-
    string cmdLastClient(int narg, char *args[], int action);
-
-
    string cmdOnline(int narg, char *args[], int action);
-
-
    string cmdConfigureMac(int narg, char *args[], int action);
-
-
    string cmdDetectorSize(int narg, char *args[], int action);
-
-
    string cmdSettings(int narg, char *args[], int action);
-
-
    string cmdSN(int narg, char *args[], int action);
-
-
    string cmdDigiTest(int narg, char *args[], int action);
-
    string cmdRegister(int narg, char *args[], int action);
-
-
    string cmdDAC(int narg, char *args[], int action);
-
    string cmdTiming(int narg, char *args[], int action);
-
    string cmdTimer(int narg, char *args[], int action);
-
-
    string cmdTimeLeft(int narg, char *args[], int action);
-
    string cmdSpeed(int narg, char *args[], int action);
-
    string cmdAdvanced(int narg, char *args[], int action);
-
-
    string cmdConfiguration(int narg, char *args[], int action);
    string cmdImage(int narg, char *args[], int action);
    string cmdADC(int narg, char *args[], int action);

slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp

@@ -2454,13 +2454,13 @@ int slsDetectorUtils::setScanSteps(int iscan, int nvalues, float *values) {
 	  scanSteps[iscan][iv]=values[iv];
 	}
       }
-     
+      
       if (scanMode[iscan]>0){
 	*actionMask |= (1 << (iscan+MAX_ACTIONS));
       } else {
 	*actionMask &= ~(1 <<  (iscan+MAX_ACTIONS));
       }
-
+      
 #ifdef VERBOSE
       cout << "Action mask is " << hex << actionMask << dec << endl;
 #endif