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

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Browse Source
This commit is contained in:
bergamaschi 2015-05-04 13:49:10 +02:00
commit bd3466b04f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

4
slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
View File

@ -130,9 +130,9 @@ class fileIOStatic {
} \
/*else cout << "******************************** cannot parse file index" << endl; \*/
uscore=s.rfind("_"); \
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)){ \
if(i==-1)return 0; \
else return i; \
else return i; } \
/*cout << "******************************** cannot parse frame index" << endl; \*/
return 0; \
};