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

server locking flag (not real lock), last client vs this client, change port implemented, most funcs of the multidetector implemented again

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@64 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2011-11-25 15:33:25 +00:00
parent f1654363e0
commit 4cbd9b2265
14 changed files with 1958 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/mythenDetector/mythenDetector.cpp
View File

@ -679,7 +679,7 @@ int mythenDetector::readDataFile(string fname, float *data, float *err, float *a
if (ang==NULL) {
ssstr >> ichan >> fdata;
ich=ichan;
if (!ssstr.good()) {
if (ssstr.fail() || ssstr.bad()) {
interrupt=1;
break;
}
@ -689,13 +689,13 @@ int mythenDetector::readDataFile(string fname, float *data, float *err, float *a
ssstr >> fang >> fdata;
ich=iline;
}
if (!ssstr.good()) {
if (ssstr.fail() || ssstr.bad()) {
interrupt=1;
break;
}
if (err)
ssstr >> ferr;
if (!ssstr.good()) {
if (ssstr.fail() || ssstr.bad()) {
interrupt=1;
break;
}
@ -707,7 +707,7 @@ int mythenDetector::readDataFile(string fname, float *data, float *err, float *a
if (err)
err[ich]=ferr;
iline++;
} else {
} else {
std::cout<< " too many lines in file: "<< iline << " instead of " << maxchans << std::endl;
interrupt=1;
break;
@ -744,7 +744,7 @@ int mythenDetector::readDataFile(string fname, int *data){
#endif
istringstream ssstr(str);
ssstr >> ichan >> idata;
if (!ssstr.good()) {
if (ssstr.fail() || ssstr.bad()) {
interrupt=1;
break;
}