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

After some speed optimization...

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@171 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-04-13 13:03:53 +00:00
parent 3ddafe3baf
commit ab4e569b6c
18 changed files with 714 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -653,7 +653,7 @@ string slsDetectorCommand::executeLine(int narg, char *args[], int action) {
string slsDetectorCommand::cmdUnknown(int narg, char *args[], int action) {
return string("Unknown command ")+string(args[0])+string("\n");//+helpLine(narg, args, action);
return string("Unknown command ")+string(args[0])+string("\n")+helpLine(0, args, action);
}
string slsDetectorCommand::cmdUnderDevelopment(int narg, char *args[], int action) {
@ -672,7 +672,7 @@ string slsDetectorCommand::helpLine(int narg, char *args[], int action) {
return helpAcquire(narg,args,HELP_ACTION);
}
if (narg==0) {
os << "Command can be: " << endl;
for(int i=0; i<numberOfCommands; ++i) {
@ -681,62 +681,11 @@ string slsDetectorCommand::helpLine(int narg, char *args[], int action) {
os << endl;
return os.str();
}
return executeLine(narg,args,HELP_ACTION);
// os << helpAcquire(narg,args,action) << endl;
// 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();
}
@ -978,7 +927,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
if (vvstr.fail())
ivar=-1;
}
if (action==PUT_ACTION) {
//add by hostname
if (ivar==-1) {
@ -1010,6 +959,7 @@ string slsDetectorCommand::helpHostname(int narg, char *args[], int action){
return os.str();
}
string slsDetectorCommand::cmdId(int narg, char *args[], int action){
#ifdef VERBOSE
cout << string("Executing command ")+string(args[0])+string(" ( ")+cmd+string(" )\n");
@ -1130,7 +1080,14 @@ string slsDetectorCommand::cmdHelp(int narg, char *args[], int action){
#ifdef VERBOSE
cout << string("Executing command ")+string(args[0])+string(" ( ")+cmd+string(" )\n");
#endif
return helpLine(narg, args, action);
cout << narg << endl;
if (narg>=1)
return helpLine(narg-1, args+1, action);
else
return helpLine(0, args, action);
}