detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into jungfrauchange

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-28 08:14:06 +02:00
parent 7541c2bcf0 4c6c078442
commit 5cc17a77c7
13 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1739,7 +1739,7 @@ int slsDetector::setNumberOfModules(int n, dimension d){
int dr=thisDetector->dynamicRange;
if (dr==24)
if ((thisDetector->myDetectorType==MYTHEN) && (dr==24))
dr=32;
thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*dr/8;
@ -4539,7 +4539,7 @@ int slsDetector::setDynamicRange(int n){
#ifdef VERBOSE
std::cout<< "Setting dynamic range to "<< n << std::endl;
#endif
if (n==24)
if ((thisDetector->myDetectorType == MYTHEN) &&(n==24))
n=32;

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -448,7 +448,6 @@ int slsDetectorUtils::acquire(int delflag){
setFileIndex(fileIO::getFileIndex());
pthread_mutex_unlock(&mg);
if (measurement_finished){
pthread_mutex_lock(&mg);
measurement_finished(im,*fileIndex,measFinished_p);