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

users:double for time in ns, bugfix:readframe wen no gui, return ok for config

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@564 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-17 09:51:31 +00:00
parent a4d99004f7
commit df6774e2c6
6 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3898,7 +3898,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
setNumberOfModules(-1);
getMaxNumberOfModules();
return iline;
return OK;
};
@ -3988,7 +3988,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
std::cout<< "wrote " <<ret << " lines to configuration file " << std::endl;
#endif
return iv;
return OK;
};
@ -4429,6 +4429,12 @@ int multiSlsDetector::resetFramesCaught() {
int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
int nel=(thisMultiDetector->dataBytes)/sizeof(int);
if(nel <= 0){
cout << "Multislsdetector databytes not valid :" << thisMultiDetector->dataBytes << endl;
fIndex = -1;
return NULL;
}
int n;
int* retval=new int[nel];
int *retdet, *p=retval;