detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +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

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1518,6 +1518,15 @@ int multiSlsDetector::setSpeed(speedVariable index, int value){
int multiSlsDetector::getDataBytes(){
int ret=0;
for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
if (detectors[ip])
ret+=detectors[ip]->getDataBytes();
}
return ret;
}
@ -2881,11 +2890,14 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) {
thisMultiDetector->numberOfChannels=0;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
cout << "detector " << idet << endl;
if (detectors[idet]) {
if (p<0)
nm=p;
else {
mm=detectors[idet]->getMaxNumberOfModules();
//mm=detectors[idet]->getMaxMods();
if (nt>mm) {
nm=mm;
nt-=nm;