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

more changes for multi for shared mem

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

2691
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

1587
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

File diff suppressed because it is too large Load Diff

21
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -4580,27 +4580,6 @@ int slsDetector::startAndReadAllNoWait(){
return FAIL; 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!
// };
/* /*