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

changed to set timer in receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@762 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-11 09:25:24 +00:00
parent ad22460b42
commit c74f4787cf
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -316,7 +316,7 @@ int slsReceiverFuncs::function_table(){
flist[F_GET_ID] = &slsReceiverFuncs::get_version; flist[F_GET_ID] = &slsReceiverFuncs::get_version;
flist[F_CONFIGURE_MAC] = &slsReceiverFuncs::set_short_frame; flist[F_CONFIGURE_MAC] = &slsReceiverFuncs::set_short_frame;
flist[F_START_READOUT] = &slsReceiverFuncs::start_readout; flist[F_START_READOUT] = &slsReceiverFuncs::start_readout;
flist[F_SET_TIMER] = &slsReceiverFuncs::set_acquisition_period; flist[F_SET_TIMER] = &slsReceiverFuncs::set_timer;
flist[F_ENABLE_COMPRESSION] = &slsReceiverFuncs::enable_compression; flist[F_ENABLE_COMPRESSION] = &slsReceiverFuncs::enable_compression;
//General Functions //General Functions
@ -1428,19 +1428,20 @@ int slsReceiverFuncs::start_readout(){
int slsReceiverFuncs::set_acquisition_period() { int slsReceiverFuncs::set_timer() {
ret=OK; ret=OK;
int64_t retval = -1; int64_t retval = -1;
int64_t index = -1; int64_t index[2];
strcpy(mess,"Could not set acquisition period in receiver\n"); index[1] = -1;
strcpy(mess,"Could not set acquisition period or frame number in receiver\n");
// receive arguments // receive arguments
if(socket->ReceiveDataOnly(&index,sizeof(index)) < 0 ){ if(socket->ReceiveDataOnly(index,sizeof(index)) < 0 ){
strcpy(mess,"Error reading from socket\n"); strcpy(mess,"Error reading from socket\n");
ret = FAIL; ret = FAIL;
} }
cout<<"index[0]"<<index[0]<<" index[1]:"<<index[1]<<endl;
// execute action if the arguments correctly arrived // execute action if the arguments correctly arrived
#ifdef SLS_RECEIVER_FUNCTION_LIST #ifdef SLS_RECEIVER_FUNCTION_LIST
if (ret==OK) { if (ret==OK) {
@ -1448,13 +1449,23 @@ int slsReceiverFuncs::set_acquisition_period() {
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP); sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL; ret=FAIL;
} }
else else{
retval=slsReceiverList->setAcquisitionPeriod(index); if(index[0] == slsDetectorDefs::FRAME_PERIOD)
retval=slsReceiverList->setAcquisitionPeriod(index[1]);
#ifdef EIGER_RECEIVER
else
retval=slsReceiverList->setNumberOfFrames(index[1]);
#endif
}
} }
#ifdef VERBOSE #ifdef VERBOSE
if(ret!=FAIL) if(ret!=FAIL){
cout << "acquisition period:" << retval << endl; if(index[0] == slsDetectorDefs::FRAME_PERIOD)
else cout << "acquisition period:" << retval << endl;
#ifdef EIGER_RECEIVER
cout << "frame number:" << retval << endl;
#endif
}else
cout << mess << endl; cout << mess << endl;
#endif #endif
#endif #endif