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

infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-13 11:13:26 +01:00
parent 678ef89e17
commit 1af065fdb1
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4299,9 +4299,9 @@ int multiSlsDetector::setFlippedData(dimension d, int value){
int multiSlsDetector::enableGapPixels(int val) {
if(getDetectorsType() != EIGER){
if(val > 0 && getDetectorsType() != EIGER){
std::cout << "Not implemented for this detector" << std::endl;
return -1;
val = -1;
}
int ret=-100,ret1;
@ -4314,15 +4314,17 @@ int multiSlsDetector::enableGapPixels(int val) {
ret=-1;
}
// update data bytes incl gap pixels
thisMultiDetector->dataBytesInclGapPixels=0;
for (int i = 0; i < thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i])
thisMultiDetector->dataBytesInclGapPixels += detectors[i]->getDataBytesInclGapPixels();
}
if (val != -1) {
// update data bytes incl gap pixels
thisMultiDetector->dataBytesInclGapPixels=0;
for (int i = 0; i < thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i])
thisMultiDetector->dataBytesInclGapPixels += detectors[i]->getDataBytesInclGapPixels();
}
// update offsets and number of channels incl gap pixels in multi level
updateOffsets();
// update offsets and number of channels incl gap pixels in multi level
updateOffsets();
}
return ret;
}