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

sharedmem: command line refactor, fixing to do

Browse Source
This commit is contained in:
maliakal_d
2018-06-25 19:18:00 +02:00
parent a97b725f43
commit d7831f6c64
1 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
View File

@ -25,6 +25,23 @@ public:
int del = 0; \ int del = 0; \
char cmd[100] = ""; \ char cmd[100] = ""; \
if (action==slsDetectorDefs::PUT_ACTION && argc<2) { \
cout << "Wrong usage - should be: "<< argv[0] << \
"[id-][pos:]channel arg" << endl; \
cout << endl; \
return; \
if (del) delete myDetector; \
}; \
if (action==slsDetectorDefs::GET_ACTION && argc<1) { \
cout << "Wrong usage - should be: "<< argv[0] << \
"[id-][pos:]channel arg" << endl; \
cout << endl; \
if (del) delete myDetector; \
return; \
}; \
// multi id scanned // multi id scanned
iv=sscanf(argv[0],"%d-%s",&id, cmd); \ iv=sscanf(argv[0],"%d-%s",&id, cmd); \
if (iv != 2 || id < 0) \ if (iv != 2 || id < 0) \
@ -43,47 +60,9 @@ public:
cout << pos << ":" ; \ cout << pos << ":" ; \
} \ } \
// readout if ((action==slsDetectorDefs::READOUT_ACTION) && (pos != -1) ) { \
if (action==slsDetectorDefs::READOUT_ACTION) { \ cout << "pos " << pos << "is not allowed for readout!" << endl; \
if (pos != -1) { \ } \
cout << "pos " << pos << "is not allowed for readout!" << endl; \
} \
// create multiSlsDetector class if required
if (myDetector==NULL) { \
try { \
myDetector = new multiSlsDetector(id, verify, update); \
} catch (const SharedMemoryException & e) { \
cout << e.GetMessage() << endl; \
return; \
} catch (...) { \
cout << " caught exception" << endl; \
return; \
} \
//myDetector->registerDataCallback(&dummyCallback, NULL);
del=1; \
} \
myCmd=new multiSlsDetectorCommand(myDetector); \
answer=myCmd->executeLine(argc, argv, action); \
cout << answer<< endl; \
delete myCmd; \
if (del) delete myDetector; \
return; \
}; \
if (action==slsDetectorDefs::PUT_ACTION && argc<2) { \
cout << "Wrong usage - should be: "<< argv[0] << \
"[id-][pos:]channel arg" << endl; \
cout << endl; \
return; \
if (del) delete myDetector; \
};
if (action==slsDetectorDefs::GET_ACTION && argc<1) { \
cout << "Wrong usage - should be: "<< argv[0] << \
"[id-][pos:]channel arg" << endl; \
cout << endl; \
if (del) delete myDetector; \
return; \
}; \
// special commands // special commands
string scmd = cmd; \ string scmd = cmd; \
@ -116,6 +95,18 @@ public:
del=1; \ del=1; \
} \ } \
// readout
if (action==slsDetectorDefs::READOUT_ACTION) { \
myCmd=new multiSlsDetectorCommand(myDetector); \
answer=myCmd->executeLine(argc, argv, action); \
cout << answer<< endl; \
delete myCmd; \
if (del) delete myDetector; \
return; \
}; \
// call multi detector command line // call multi detector command line
myCmd=new multiSlsDetectorCommand(myDetector); \ myCmd=new multiSlsDetectorCommand(myDetector); \
answer=myCmd->executeLine(argc, argv, action, pos); \ answer=myCmd->executeLine(argc, argv, action, pos); \