From e0f645ed4b2c0d5b5c750d6059215457755dc1b0 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 25 Feb 2016 16:25:27 +0100 Subject: [PATCH 1/2] some change --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 1a98955c0..f05bd31e9 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1753,6 +1753,14 @@ int multiSlsDetector::setDynamicRange(int n, int pos){ } } + //for usability for the user + if (getDetectorsType() == EIGER){ + if(thisMultiDetector->dataBytes == 32) + setSpeed(CLOCK_DIVIDER,2); + else if(thisMultiDetector->dataBytes == 16) + setSpeed(CLOCK_DIVIDER,1); + } + return thisMultiDetector->dataBytes; }; From 6e52c72307fcf7e2517a15e3eafb78abb4b0a2cb Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 25 Feb 2016 16:35:22 +0100 Subject: [PATCH 2/2] eiger user: setting clk to 2 for 32 dr, and 1 for 16 dr --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index f05bd31e9..5ac484452 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1755,10 +1755,14 @@ int multiSlsDetector::setDynamicRange(int n, int pos){ //for usability for the user if (getDetectorsType() == EIGER){ - if(thisMultiDetector->dataBytes == 32) + if(thisMultiDetector->dataBytes == 32){ + std::cout << "Setting Clock to Quarter Speed to cope with Dynamic Range of 32" << std::endl; setSpeed(CLOCK_DIVIDER,2); - else if(thisMultiDetector->dataBytes == 16) + } + else if(thisMultiDetector->dataBytes == 16){ + std::cout << "Setting Clock to Half Speed for Dynamic Range of 16" << std::endl; setSpeed(CLOCK_DIVIDER,1); + } } return thisMultiDetector->dataBytes;