detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-23 13:03:01 +01:00
Code Issues Actions Packages Releases Activity

got rid of egier_reciver ifdef and reorganized the slreceiverfunctionlist

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@792 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-18 15:51:58 +00:00
parent f25e016f64
commit 1191fe5674
6 changed files with 329 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@@ -1467,19 +1467,16 @@ int slsReceiverFuncs::set_timer() {
else{
if(index[0] == slsDetectorDefs::FRAME_PERIOD)
retval=slsReceiverList->setAcquisitionPeriod(index[1]);
#ifdef EIGER_RECEIVER_H
else
retval=slsReceiverList->setNumberOfFrames(index[1]);
#endif
}
}
#ifdef VERBOSE
if(ret!=FAIL){
if(index[0] == slsDetectorDefs::FRAME_PERIOD)
cout << "acquisition period:" << retval << endl;
#ifdef EIGER_RECEIVER_H
else
cout << "frame number:" << retval << endl;
#endif
}else
cout << mess << endl;
#endif
@@ -1576,11 +1573,8 @@ int slsReceiverFuncs::set_detector_hostname() {
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL;
}
#ifdef EIGER_RECEIVER_H
else
strcpy(retval,slsReceiverList->setDetectorHostname(hostname));
#endif
}
#ifdef VERBOSE
if(ret!=FAIL)
@@ -1781,9 +1775,9 @@ int slsReceiverFuncs::send_update() {
//index
#ifdef SLS_RECEIVER_FUNCTION_LIST
#ifndef EIGER_RECEIVER
ind=slsReceiverList->getFileIndex();
#endif
if(myDetectorType != EIGER)
ind=slsReceiverList->getFileIndex();
socket->SendDataOnly(&ind,sizeof(ind));
#endif