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 'developer' into rxrmetadata

Browse Source
This commit is contained in:
maliakal_d 2020-09-07 16:15:56 +02:00
commit cf3758f155
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -288,17 +288,31 @@ void DetectorImpl::updateDetectorSize() {
LOG(logDEBUG) << "Updating Multi-Detector Size: " << size(); LOG(logDEBUG) << "Updating Multi-Detector Size: " << size();
const slsDetectorDefs::xy det_size = detectors[0]->getNumberOfChannels(); const slsDetectorDefs::xy det_size = detectors[0]->getNumberOfChannels();
int maxx = multi_shm()->numberOfChannels.x;
int maxy = multi_shm()->numberOfChannels.y; int maxy = multi_shm()->numberOfChannels.y;
int ndetx = 0, ndety = 0;
// 1d, add detectors along x axis
if (det_size.y == 1) {
if (maxx == 0) {
maxx = det_size.x * size();
}
ndetx = maxx / det_size.x;
ndety = size() / ndetx;
if ((maxx % det_size.x) > 0) {
++ndety;
}
}
// 2d, add detectors along y axis (due to eiger top/bottom)
else {
if (maxy == 0) { if (maxy == 0) {
maxy = det_size.y * size(); maxy = det_size.y * size();
} }
ndety = maxy / det_size.y;
int ndety = maxy / det_size.y; ndetx = size() / ndety;
int ndetx = size() / ndety;
if ((maxy % det_size.y) > 0) { if ((maxy % det_size.y) > 0) {
++ndetx; ++ndetx;
} }
}
multi_shm()->numberOfDetector.x = ndetx; multi_shm()->numberOfDetector.x = ndetx;
multi_shm()->numberOfDetector.y = ndety; multi_shm()->numberOfDetector.y = ndety;