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

frame index in file name, increments instead of file index for real time acquisitions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-30 15:52:40 +00:00
parent 2f9dea8341
commit 96d08d61d0
14 changed files with 307 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1273,6 +1273,7 @@ int slsDetector::setNumberOfModules(int n, dimension d){
#endif
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {
cout << "connected" << endl;
if (controlSocket->Connect()>=0) {
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->SendDataOnly(&arg,sizeof(arg));
@ -1287,8 +1288,10 @@ int slsDetector::setNumberOfModules(int n, dimension d){
if (ret==FORCE_UPDATE)
updateDetector();
}
}
} else
cout << "no control socket?!??!?" << endl;
} else {
cout << "offline" << endl;
ret=OK;
if (n==GET_FLAG)
;
@ -1389,7 +1392,7 @@ int slsDetector::getMaxNumberOfModules(dimension d){
std::cout<< "Max number of modules in dimension "<< d <<" is " << retval << std::endl;
#endif
if (ret==FAIL) {
std::cout<< "Get max number of modules failed " << std::endl;
std::cout<< "Get max number of modules failed " << retval << std::endl;
return retval;
} else {
thisDetector->nModMax[d]=retval;