detectors/slsDetectorPackage
24
1 Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-11-06 16:23:50 +01:00
Code Issues Actions Packages Releases Activity

more changes for multi for shared mem

Browse Source
This commit is contained in:
maliakal_d committed 2018-06-19 16:38:18 +02:00
1 parent 99bf6446fe
commit fc0f8ef9da
3 files changed
+2150 -2149
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+1344 -1347
View File
File diff suppressed because it is too large. Load diff
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+806 -781
View File
File diff suppressed because it is too large. Load diff
slsDetectorSoftware/slsDetector/slsDetector.cpp
-21
View File
@@ -4580,27 +4580,6 @@ int slsDetector::startAndReadAllNoWait(){
return FAIL;
};
// int* slsDetector::getDataFromDetectorNoWait() {
// int *retval=getDataFromDetector();
// if (thisDetector->onlineFlag==ONLINE_FLAG) {
// if (controlSocket) {
// if (retval==NULL){
// disconnectControl();
// #ifdef VERBOSE
// std::cout<< "Run finished "<< std::endl;
// #endif
// } else {
// #ifdef VERBOSE
// std::cout<< "Frame received "<< std::endl;
// #endif
// }
// }
// }
// return retval; // check what we return!
// };
/*