From bc8b0860b4658b736f2f75c8298558b4b8ade066 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 19 Mar 2012 14:50:44 +0000 Subject: [PATCH] moved testfunction to slsDetectorUtils git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@155 951219d9-93cf-4727-9268-0efd64621fa3 --- .../multiSlsDetector/multiSlsDetector.cpp | 17 ----------------- .../multiSlsDetector/multiSlsDetector.h | 8 -------- 2 files changed, 25 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index a4bc6f557..a6f2529f3 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3218,23 +3218,6 @@ int multiSlsDetector::retrieveDetectorSetup(string const fname1, int level){ - -int multiSlsDetector::testFunction(int times) { - - 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; -} - - int multiSlsDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch) { #ifdef VERBOSE diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 5ceb8d677..bfe08f8db 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -886,14 +886,6 @@ class multiSlsDetector : public slsDetectorUtils { */ int loadImageToDetector(imageType index,string const fname); - - /** - Test function - \param times number of repetitions - \returns repetition when it fails - */ - int testFunction(int times=0); - /** sets the value of s angular conversion parameter \param c can be ANGULAR_DIRECTION, GLOBAL_OFFSET, FINE_OFFSET, BIN_SIZE