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

void pointers added to callback functions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
ramani_n
2012-06-22 12:12:29 +00:00
parent 6298136a19
commit 67471563b0
10 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -99,6 +99,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
id++;
}
id--;
if (thisMultiDetector->alreadyExisting==0) {

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
View File

@ -55,6 +55,7 @@ class multiSlsDetectorClient {
};
del=1;
} \
cout << "multislsdetector id "<< id << endl; \
iv=sscanf(argv[0],"%d:%s",&pos, cmd); \
if (iv==2 && pos>=0) { \
argv[0]=cmd; \

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorCommand.h
View File

@ -30,13 +30,15 @@ class multiSlsDetectorCommand : public slsDetectorCommand {
string executeLine(int narg, char *args[], int action, int id=-1) { \
string s; \
printf("mess %d of %d\n",id, myDet->getNumberOfDetectors()); \
if (id>=0) {
slsDetector *d=myDet->getSlsDetector(id); \
if (d) { \
slsDetectorCommand *cmd=new slsDetectorCommand(d); \
s=cmd->executeLine(narg, args, action); \
delete cmd;
} else s=string("detector does no exist"); \
} else
s=string("detector does no exist"); \
} else \
s=slsDetectorCommand::executeLine(narg,args,action); \
return s;