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

WIP

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-16 10:46:42 +02:00
parent 947252c852
commit 336f8ceb50
4 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -429,25 +429,23 @@ void multiSlsDetector::addSlsDetector(const std::string &hostname) {
void multiSlsDetector::updateDetectorSize() {
FILE_LOG(logDEBUG) << "Updating Multi-Detector Size: " << size();
slsDetectorDefs::xy res = detectors[0]->getNumberOfChannels();
int my = res.x;
int mx = res.y;
const slsDetectorDefs::xy det_size = detectors[0]->getNumberOfChannels();
int maxy = multi_shm()->maxNumberOfChannels[Y];
if (maxy == 0) {
maxy = my * size();
maxy = det_size.y * size();
}
int ndety = maxy / my;
int ndety = maxy / det_size.y;
int ndetx = size() / ndety;
if ((maxy % my) > 0) {
if ((maxy % det_size.y) > 0) {
++ndetx;
}
multi_shm()->numberOfDetector[X] = ndetx;
multi_shm()->numberOfDetector[Y] = ndety;
multi_shm()->numberOfChannels[X] = mx * ndetx;
multi_shm()->numberOfChannels[Y] = my * ndety;
multi_shm()->numberOfChannels[X] = det_size.x * ndetx;
multi_shm()->numberOfChannels[Y] = det_size.y * ndety;
FILE_LOG(logDEBUG)
<< "\n\tNumber of Detectors in X direction:"