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

solved segmentation fault on may frames, printing progress during acquisition

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@144 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-03-16 12:25:45 +00:00
parent 97a0d06618
commit d8d08d5a9b
4 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -619,15 +619,15 @@ string slsDetectorCommand::executeLine(int narg, char *args[], int action) {
if(key==descrToFuncMap[i].m_pFuncName){
#ifdef VERBOSE
std::cout<<i << " command="<< descrToFuncMap[i].m_pFuncName<<" key="<<key <<std::endl;
std::cout<<i << " command="<< descrToFuncMap[i].m_pFuncName<<" key="<<key <<std::endl;
#endif
cmd=descrToFuncMap[i].m_pFuncName;
MemFuncGetter memFunc=descrToFuncMap[i].m_pFuncPtr;
string dResult=(this->*memFunc)(narg, args, action);
return dResult;
}
}
}
return cmdUnknown(narg,args,action);
@ -637,7 +637,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(narg, args, action);
}
string slsDetectorCommand::cmdUnderDevelopment(int narg, char *args[], int action) {
@ -732,7 +732,7 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) {
#endif
myDet->setOnline(ONLINE_FLAG);
myDet->acquire(1);
return string("ok");
return string("");
}
@ -770,7 +770,7 @@ string slsDetectorCommand::cmdData(int narg, char *args[], int action) {
myDet->readAll();
myDet->processData(1);
myDet->setThreadedProcessing(b);
return string("ok");
return string("");
}
}
@ -798,11 +798,11 @@ string slsDetectorCommand::cmdFrame(int narg, char *args[], int action) {
} else {
b=myDet->setThreadedProcessing(-1);
myDet->setThreadedProcessing(0);
myDet->setOnline(ONLINE_FLAG);
myDet->readFrame();
myDet->processData(1);
myDet->setOnline(ONLINE_FLAG);
myDet->readFrame();
myDet->processData(1);
myDet->setThreadedProcessing(b);
return string("ok");
return string("ok");
}
}
@ -1763,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[MAX_STR_LENGTH*10];
char answer[MAX_SCAN_STEPS*10];
float *values;
if (action==HELP_ACTION)
return helpScans(narg,args,action);