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

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
Show Stats 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;
}

9
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1747,7 +1747,10 @@ int slsDetector::getTotalNumberOfChannels() {
thisDetector->nChans=thisDetector->nChan[X];
thisDetector->dataBytes=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods*2*thisDetector->timerValue[SAMPLES_JCTB];
// cout << "Total number of channels is "<< thisDetector->nChans*thisDetector->nChips*thisDetector->nMods << " data bytes is " << thisDetector->dataBytes << endl;
thisDetector->dataBytesInclGapPixels = getTotalNumberOfChannelsInclGapPixels(X)*getTotalNumberOfChannelsInclGapPixels(Y) *2*thisDetector->timerValue[SAMPLES_JCTB];
thisDetector->dataBytesInclGapPixels =
(thisDetector->nChan[X]*thisDetector->nChip[X]*thisDetector->nMod[X]) + (thisDetector->gappixels * thisDetector->nGappixels[X]) *
(thisDetector->nChan[Y]*thisDetector->nChip[Y]*thisDetector->nMod[Y]) + (thisDetector->gappixels * thisDetector->nGappixels[Y]) *
2*thisDetector->timerValue[SAMPLES_JCTB];
} else {
#ifdef VERBOSE
cout << "det type is "<< thisDetector->myDetectorType << endl;
@ -2007,8 +2010,8 @@ int slsDetector::setFlippedData(dimension d, int value){
int slsDetector::enableGapPixels(int val) {
if(thisDetector->myDetectorType!= EIGER)
return -1;
if(val > 0 && thisDetector->myDetectorType!= EIGER)
val = -1;
if (val >= 0) {
val=(val>0)?1:0;