detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +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

15
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -55,6 +55,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
frameIndexOffset(GOTTHARD_FRAME_INDEX_OFFSET),
acquisitionPeriod(SAMPLE_TIME_IN_NS),
numberOfFrames(0),
dynamicRange(0),
shortFrame(-1),
currframenum(0),
prevframenum(0),
@ -378,9 +379,17 @@ int32_t slsReceiverFunctionList::setScanTag(int32_t stag){
}
int32_t slsReceiverFunctionList::setDynamicRange(int32_t dr){
if(dr >= 0)
receiver->setDynamicRange(dr);
return receiver->getDynamicRange();
if(dr >= 0){
if(myDetectorType == EIGER)
receiver->setDynamicRange(dr);
else
dynamicRange = dr;
}
if(myDetectorType == EIGER)
return receiver->getDynamicRange();
else
return dynamicRange;
}

3
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -437,6 +437,9 @@ private:
/** frame number */
int32_t numberOfFrames;
/** dynamic range */
int dynamicRange;
/** short frames */
int shortFrame;

62
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -320,7 +320,7 @@ int slsReceiverFuncs::function_table(){
flist[F_SET_TIMER] = &slsReceiverFuncs::set_timer;
flist[F_ENABLE_COMPRESSION] = &slsReceiverFuncs::enable_compression;
flist[F_SET_DETECTOR_HOSTNAME] = &slsReceiverFuncs::set_detector_hostname;
flist[F_SET_DYNAMIC_RANGE] = &slsReceiverFuncs::set_dynamic_range;
//General Functions
flist[F_LOCK_SERVER] = &slsReceiverFuncs::lock_receiver;
@ -1605,6 +1605,66 @@ int slsReceiverFuncs::set_detector_hostname() {
int slsReceiverFuncs::set_dynamic_range() {
ret=OK;
int retval=-1;
int dr;
strcpy(mess,"Could not set dynamic range\n");
// receive arguments
if(socket->ReceiveDataOnly(&dr,sizeof(dr)) < 0 ){
strcpy(mess,"Error reading from socket\n");
ret = FAIL;
}
// execute action if the arguments correctly arrived
#ifdef SLS_RECEIVER_FUNCTION_LIST
if (ret==OK) {
if (lockStatus==1 && socket->differentClients==1){
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL;
}
else
retval=slsReceiverList->setDynamicRange(dr);
}
#ifdef VERBOSE
if(ret!=FAIL)
cout << "dynamic range" << dr << endl;
else
cout << mess << endl;
#endif
#endif
if(ret==OK && socket->differentClients){
cout << "Force update" << endl;
ret=FORCE_UPDATE;
}
// send answer
socket->SendDataOnly(&ret,sizeof(ret));
if(ret==FAIL)
socket->SendDataOnly(mess,sizeof(mess));
socket->SendDataOnly(&retval,sizeof(retval));
//return ok/fail
return ret;
}

5
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.h
View File

@ -157,10 +157,11 @@ public:
/** enable compression */
int enable_compression();
/** set detector hostname for eiger */
/** set detector hostname */
int set_detector_hostname();
/** set dynamic range */
int set_dynamic_range();
//General Functions