From e72621959e5da2fd02bd181127d570228d9e7d75 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 3 Apr 2012 09:44:06 +0000
Subject: [PATCH] changed the test function a bit

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@169 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetector/slsDetectorUtils.cpp            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index 77eec9d68..377a26431 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -501,11 +501,14 @@ int slsDetectorUtils::testFunction(int times) {
 
 	for(i=0;i<times;i++){
 	    sprintf(statusval,"%x",readRegister(0x25));
-		std::cout<<std::endl<<dec<<i+1<<": \t"<<statusval<<"\t";
-usleep(10000);
+		std::cout<<std::endl<<dec<<i+1<<": stat:\t"<<statusval<<"\t";
+		sprintf(controlval,"%x",readRegister(0x24));
+		std::cout<<"cont:"<<controlval<<"\t"<<std::endl;
 
 		startAcquisition();
 
+		sprintf(controlval,"%x",readRegister(0x24));
+		std::cout<<"cont:"<<controlval<<"\t"<<std::endl;
 	    //sprintf(statusval,"%x",readRegister(0x25));
 	    //std::cout<<statusval<<std::endl;
 		s = getRunStatus();
@@ -516,21 +519,21 @@ usleep(10000);
 				std::cout<<"IDLE"<<std::endl;
 				exit(-1);
 			}
-
+			;
 		}
 		else {
 			if (s==RUNNING){
 			count=0;
 			while(s==RUNNING){
-				count++;
-				if(count==5){
+				count++;//std::cout<<"count:"<<count<<std::endl;
+				if(count==4){
 					sprintf(statusval,"%x",readRegister(0x25));
 
 
-					std::cout<<"STUCK: "<<statusval<<std::endl;
+					std::cout<<"STUCK: stat"<<statusval<<std::endl;
 					exit(-1);
 				}
-				usleep(2);
+				usleep(50000);
 				//val=readRegister(0x25);
 				s = getRunStatus();
 			}