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

included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-11 17:20:57 +00:00
parent 9cfdbdac67
commit 4cc8566311
18 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5773,7 +5773,7 @@ int slsDetector::getFramesCaughtByReceiver(){
int slsDetector::getCurrentFrameIndex(){
int slsDetector::getReceiverCurrentFrameIndex(){
int fnum=F_GET_FRAME_INDEX;
int ret = FAIL;
int retval=-1;

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1461,7 +1461,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** gets the current frame index of receiver
\returns current frame index of receiver
*/
int getCurrentFrameIndex();
int getReceiverCurrentFrameIndex();
/**
* resets framescaught

2
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -455,7 +455,7 @@ class slsDetectorBase : public virtual slsDetectorDefs {
/**
\returns current frame index of receiver
*/
virtual int getCurrentFrameIndex()=0;
virtual int getReceiverCurrentFrameIndex()=0;
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -3609,7 +3609,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
if (action==PUT_ACTION)
return string("cannot put");
else{
sprintf(answer,"%d",myDet->getCurrentFrameIndex());
sprintf(answer,"%d",myDet->getReceiverCurrentFrameIndex());
return string(answer);
}
}

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -233,6 +233,7 @@ void slsDetectorUtils::acquire(int delflag){
get_i0(0, IOarg);
}
setCurrentFrameIndex(0);
if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
setFrameIndex(0);
} else {

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -620,7 +620,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
/**
\returns current frame index of receiver
*/
virtual int getCurrentFrameIndex()=0;
virtual int getReceiverCurrentFrameIndex()=0;
/**
* resets framescaught