detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into parallel

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-03-21 15:00:51 +01:00
commit 5e337debd1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1832,11 +1832,11 @@ int multiSlsDetector::setDynamicRange(int n, int pos){
//for usability for the user //for usability for the user
if (getDetectorsType() == EIGER){ if (getDetectorsType() == EIGER){
if(thisMultiDetector->dataBytes == 32){ if(n == 32){
std::cout << "Setting Clock to Quarter Speed to cope with Dynamic Range of 32" << std::endl; std::cout << "Setting Clock to Quarter Speed to cope with Dynamic Range of 32" << std::endl;
setSpeed(CLOCK_DIVIDER,2); setSpeed(CLOCK_DIVIDER,2);
} }
else if(thisMultiDetector->dataBytes == 16){ else if(n == 16){
std::cout << "Setting Clock to Half Speed for Dynamic Range of 16" << std::endl; std::cout << "Setting Clock to Half Speed for Dynamic Range of 16" << std::endl;
setSpeed(CLOCK_DIVIDER,1); setSpeed(CLOCK_DIVIDER,1);
} }
@ -3617,6 +3617,17 @@ int multiSlsDetector::setDynamicRange(int p) {
} }
} }
//for usability for the user
if (getDetectorsType() == EIGER){
if(p == 32){
std::cout << "Setting Clock to Quarter Speed to cope with Dynamic Range of 32" << std::endl;
setSpeed(CLOCK_DIVIDER,2);
}
else if(p == 16){
std::cout << "Setting Clock to Half Speed for Dynamic Range of 16" << std::endl;
setSpeed(CLOCK_DIVIDER,1);
}
}
return ret; return ret;
} }