detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +02:00
Code Issues Actions Packages Releases Activity

frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-05 11:23:46 +00:00
parent ed4aaa83ce
commit 7a55ed9a74
14 changed files with 196 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -121,10 +121,8 @@ void slsDetectorUtils::acquire(int delflag){
//resets frames caught in receiver
if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1)
resetFramesCaught(1);
else
resetFramesCaught(0);
resetFramesCaught();
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
@ -234,7 +232,8 @@ void slsDetectorUtils::acquire(int delflag){
}
setCurrentFrameIndex(0);
if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
//if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
if ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1){
setFrameIndex(0);
} else {
setFrameIndex(-1);