really merged after the mess...

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@163 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-03-23 15:58:03 +00:00
parent 13344152aa
commit 2463c9841c
7 changed files with 187 additions and 162 deletions

View File

@ -6,7 +6,7 @@
#include <iomanip>
slsDetectorCommand::slsDetectorCommand(slsDetectorBase *det) {
slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
myDet=det;
@ -134,6 +134,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorBase *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
i++;
/* trim/cal directories */
descrToFuncMap[i].m_pFuncName="trimdir"; //OK
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettingsDir;
@ -1636,7 +1637,6 @@ string slsDetectorCommand::helpThreaded(int narg, char *args[], int action){
}
string slsDetectorCommand::cmdImage(int narg, char *args[], int action){
string sval;
int retval;
@ -1676,7 +1676,6 @@ string slsDetectorCommand::helpImage(int narg, char *args[], int action){
}
string slsDetectorCommand::cmdCounter(int narg, char *args[], int action){
int ival;
string sval;
@ -1728,6 +1727,7 @@ string slsDetectorCommand::helpCounter(int narg, char *args[], int action){
string slsDetectorCommand::cmdPositions(int narg, char *args[], int action){
int ival;
int ip;