From 71129714e49a29757fa5471994247d60a112cf97 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 21 Mar 2016 15:00:15 +0100 Subject: [PATCH] usability for eiger dr32 sets clk to 2 and dr 16 sets clk to 1 --- .../multiSlsDetector/multiSlsDetector.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 5ac484452..4857ec383 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1755,11 +1755,11 @@ int multiSlsDetector::setDynamicRange(int n, int pos){ //for usability for the user 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; 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; setSpeed(CLOCK_DIVIDER,1); } @@ -3540,6 +3540,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; }