detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

changed the test function a bit

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@169 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-04-03 09:44:06 +00:00
parent d8e03f80e4
commit e72621959e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

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