detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

shortframes work with gui enabled

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@445 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-31 11:13:21 +00:00
parent 22bd638f64
commit 341e026f4e
8 changed files with 95 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4681,8 +4681,7 @@ int slsDetector::configureMAC(int adc){
char arg[5][50];
char cword[50]="", *pcword;
string sword;
int shortframe=1;
int retval=-100;
int retval=-1;
if(((adc>=-1)&&(adc<=4))||(adc==-100));
else{
@ -4811,11 +4810,10 @@ int slsDetector::configureMAC(int adc){
//connect to receiver
if(thisDetector->receiverOnlineFlag==ONLINE_FLAG){
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
if(retval==-1) shortframe=0;
#ifdef VERBOSE
std::cout << "Sending shortframe to receiver " << shortframe << std::endl;
std::cout << "Sending adc val to receiver " << retval << std::endl;
#endif
ret=thisReceiver->sendInt(fnum,retval,shortframe);
ret=thisReceiver->sendInt(fnum,retval,retval);
if(ret==FAIL)
setErrorMask((getErrorMask())|(COULD_NOT_CONFIGURE_MAC));
}