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

set dynamic range implemented for receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@797 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-20 16:10:25 +00:00
parent 1607ddb096
commit 1557cb1de8
6 changed files with 116 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3538,10 +3538,12 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
//send acquisiton period/frame number to receiver
if((index==FRAME_NUMBER)||(index==FRAME_PERIOD))
{
if((ret != FAIL) && (t != -1)){
if(ret != FAIL){
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
int64_t args[2];
args[1] = retval;
if(t == -1)
args[1] = -1;
if(index==FRAME_NUMBER){
#ifdef VERBOSE
@ -4017,7 +4019,7 @@ int slsDetector::setDynamicRange(int n){
// cout << "single " << endl;
int fnum=F_SET_DYNAMIC_RANGE;
int retval=-1;
int retval=-1,retval1;
char mess[100];
int ret=OK;
@ -4068,8 +4070,27 @@ int slsDetector::setDynamicRange(int n){
std::cout<< "Dynamic range set to "<< thisDetector->dynamicRange << std::endl;
std::cout<< "Data bytes "<< thisDetector->dataBytes << std::endl;
#endif
}
}
//receiver
if(ret != FAIL){
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
#ifdef VERBOSE
std::cout << "Sending/Getting dynamic range to/from receiver " << retval << std::endl;
#endif
if (connectData() == OK)
ret=thisReceiver->sendInt(fnum,retval1,retval);
if((retval1 != retval)|| (ret==FAIL)){
ret = FAIL;
cout << "ERROR:Acquisition Period in receiver set incorrectly to " << retval1 << " instead of " << retval << endl;
setErrorMask((getErrorMask())|(RECEIVER_DYNAMIC_RANGE));
}
if(ret==FORCE_UPDATE)
updateReceiver();
}
}
return thisDetector->dynamicRange;
};
@ -4876,9 +4897,15 @@ char* slsDetector::setReceiver(string receiverIP){
else
setFrameIndex(-1);
setTimer(FRAME_PERIOD,setTimer(FRAME_PERIOD,-1));
setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
setUDPConnection();
}
else{
setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
setDynamicRange(thisDetector->dynamicRange);
}
}
return thisDetector->receiver_hostname;