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

frame number form receiver

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

66
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3532,25 +3532,46 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
setTotalProgress(); setTotalProgress();
} }
if((ret != FAIL) && (t! = -1)){
//send acquisiton period to receiver //send acquisiton period to receiver
if((setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) && (index==FRAME_PERIOD) && (ret != FAIL) && (t != -1)){ if((setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) && ((index==FRAME_PERIOD)||(index==FRAME_NUMBER)) && (ret != FAIL) && (t != -1)){
//if acquisition period is zero, then #frames/buffer depends on exposure time and not acq period int64_t args[2];
if(!retval) args[1] = retval;
retval = timerValue[ACQUISITION_TIME]; if(index==FRAME_NUMBER)
args[0] = FRAME_NUMBER;
else{
args[0] = FRAME_PERIOD;
//if acquisition period is zero, then #frames/buffer depends on exposure time and not acq period
if(!retval)
args[1] = timerValue[ACQUISITION_TIME];
}
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Sending/Getting acquisition period to/from receiver " << retval << std::endl; if(index==FRAME_PERIOD)
std::cout << "Sending/Getting acquisition period to/from receiver " << retval << std::endl;
else
std::cout << "Sending/Getting number of frames to/from receiver " << retval << std::endl;
#endif #endif
if (connectData() == OK) if (connectData() == OK)
ret=thisReceiver->sendInt(fnum,ut,retval); ret=thisReceiver->sendIntArray(fnum,ut,args);
if(ut != retval){ if(ut != retval){
ret = FAIL; ret = FAIL;
cout << "ERROR:Acquisition Period in receiver set incorrectly to " << ut << " instead of " << retval << endl; cout << "ERROR:Acquisition Period in receiver set incorrectly to " << ut << " instead of " << retval << endl;
} }
if(ret==FAIL) if(ret==FAIL){
setErrorMask((getErrorMask())|(RECEIVER_ACQ_PERIOD_NOT_SET)); if(index==FRAME_PERIOD)
setErrorMask((getErrorMask())|(RECEIVER_ACQ_PERIOD_NOT_SET));
else
setErrorMask((getErrorMask())|(RECEIVER_FRAME_NUM_NOT_SET));
}
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();
} }
}
return thisDetector->timerValue[index]; return thisDetector->timerValue[index];
@ -4831,21 +4852,28 @@ char* slsDetector::setReceiver(string receiverIP){
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 <<
"file index:" << fileIO::getFileIndex() << endl << "write enable:" << parentDet->enableWriteToFileMask() << endl;
"frame index needed:" << ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1) << endl << if(thisDetector->myDetectorType != EIGER){
"write enable:" << parentDet->enableWriteToFileMask() << endl << std::cout << "file index:" << fileIO::getFileIndex() << endl <<
"frame period:" << setTimer(FRAME_PERIOD,-1) << endl << endl; "frame index needed:" << ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1) << endl <<
"frame period:" << setTimer(FRAME_PERIOD,-1) << endl;
}
std::cout << endl;
#endif #endif
setFilePath(fileIO::getFilePath()); setFilePath(fileIO::getFilePath());
setFileName(fileIO::getFileName()); setFileName(fileIO::getFileName());
setFileIndex(fileIO::getFileIndex());
if ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1)
setFrameIndex(0);
else
setFrameIndex(-1);
enableWriteToFile(parentDet->enableWriteToFileMask()); enableWriteToFile(parentDet->enableWriteToFileMask());
setTimer(FRAME_PERIOD,setTimer(FRAME_PERIOD,-1));
setUDPConnection(); if(thisDetector->myDetectorType != EIGER){
setFileIndex(fileIO::getFileIndex());
if ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1)
setFrameIndex(0);
else
setFrameIndex(-1);
setTimer(FRAME_PERIOD,setTimer(FRAME_PERIOD,-1));
setUDPConnection();
}
} }
return thisDetector->receiver_hostname; return thisDetector->receiver_hostname;