From c822b064ab9a4dfc3515f8793abdc7348b432c42 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 16 Mar 2012 15:47:25 +0000 Subject: [PATCH] added the testfunction git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@151 951219d9-93cf-4727-9268-0efd64621fa3 --- .../multiSlsDetector/multiSlsDetector.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 030fe43a3..a4bc6f557 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3220,7 +3220,18 @@ int multiSlsDetector::retrieveDetectorSetup(string const fname1, int level){ int multiSlsDetector::testFunction(int times) { - return OK; + + int ret=-100, ret1; + for (int idet=0; idetnumberOfDetectors; idet++) { + if (detectors[idet]) { + ret1=detectors[idet]->testFunction(times); + if (ret==-100) + ret=ret1; + else if (ret!=ret1) + ret=-1; + } + } + return ret; }