detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

multiple detector on one PC should now work

Browse Source
This commit is contained in:
bergamaschi 2015-08-28 12:14:55 +02:00
parent 84ad2912c6
commit b073ecacb9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
View File

@ -27,6 +27,7 @@ class multiSlsDetectorClient {
//myDetector->registerDataCallback(&dummyCallback, NULL); //myDetector->registerDataCallback(&dummyCallback, NULL);
del=1; \ del=1; \
}; };
cout << "noid" <<endl;
myCmd=new multiSlsDetectorCommand(myDetector); \ myCmd=new multiSlsDetectorCommand(myDetector); \
answer=myCmd->executeLine(argc, argv, action); \ answer=myCmd->executeLine(argc, argv, action); \
cout << answer<< endl; \ cout << answer<< endl; \
@ -51,10 +52,10 @@ class multiSlsDetectorClient {
return; \ return; \
}; \ }; \
if (myDetector==NULL) { \ if (myDetector==NULL) { \
iv=sscanf(argv[0],"%d-%s",&id, cmd); \ iv=sscanf(argv[0],"%d-%s",&id, cmd); \
if (iv==2 && id>=0) { \ if (id>=0) { \
myDetector=new multiSlsDetector(id); \ myDetector=new multiSlsDetector(id); \
argv[0]=cmd; \ argv[0]=cmd; \
cout << id << "-" ; \ cout << id << "-" ; \
} else { \ } else { \
myDetector=new multiSlsDetector(); \ myDetector=new multiSlsDetector(); \