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

fixed bug in settings frmes for eiger and not for gotthard

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@775 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-14 10:08:52 +00:00
parent 4f4d8d4caf
commit 8a8ee59474
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3534,10 +3534,22 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
if((ret != FAIL) && (t != -1)){
//send acquisiton period to receiver //send acquisiton period/frame number to receiver
if((setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) && ((index==FRAME_PERIOD)||(index==FRAME_NUMBER)) && (ret != FAIL) && (t != -1)){ switch(thisDetector->myDetectorType){
case EIGER:
if(index != FRAME_NUMBER)
return thisDetector->timerValue[index];
break;
//for gotthard and moench, mythen returns anyway because of no rxr
default:
if(index != FRAME_PERIOD)
return thisDetector->timerValue[index];
break;
}
if((ret != FAIL) && (t != -1)){
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
int64_t args[2]; int64_t args[2];
args[1] = retval; args[1] = retval;
if(index==FRAME_NUMBER) if(index==FRAME_NUMBER)
@ -3571,6 +3583,7 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();
} }
} }
return thisDetector->timerValue[index]; return thisDetector->timerValue[index];
@ -4848,7 +4861,7 @@ char* slsDetector::setReceiver(string receiverIP){
strcpy(thisDetector->receiver_hostname,receiverIP.c_str()); strcpy(thisDetector->receiver_hostname,receiverIP.c_str());
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){ if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
#ifdef VERBOSE //#ifdef VERBOSE
std::cout << "Setting up receiver with" << endl << std::cout << "Setting up receiver with" << endl <<
"file path:" << fileIO::getFilePath() << endl << "file path:" << fileIO::getFilePath() << endl <<
"file name:" << fileIO::getFileName() << endl << "file name:" << fileIO::getFileName() << endl <<
@ -4859,7 +4872,7 @@ char* slsDetector::setReceiver(string receiverIP){
"frame period:" << setTimer(FRAME_PERIOD,-1) << endl; "frame period:" << setTimer(FRAME_PERIOD,-1) << endl;
} }
std::cout << endl; std::cout << endl;
#endif //#endif
if(thisDetector->myDetectorType == EIGER) if(thisDetector->myDetectorType == EIGER)
setDetectorHostname(); setDetectorHostname();
setFilePath(fileIO::getFilePath()); setFilePath(fileIO::getFilePath());