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

different between acquisition index and frame index

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-03-12 12:22:19 +01:00
parent 6232c6584a
commit 7e44648da9
12 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6447,7 +6447,7 @@ int slsDetector::resetFramesCaught(){
int* slsDetector::readFrameFromReceiver(char* fName, int &fIndex){
int* slsDetector::readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex){
int fnum=F_READ_RECEIVER_FRAME;
int nel=thisDetector->dataBytes/sizeof(int);
int* retval=new int[nel];
@ -6472,7 +6472,8 @@ int* slsDetector::readFrameFromReceiver(char* fName, int &fIndex){
return NULL;
} else {
n=dataSocket->ReceiveDataOnly(fName,MAX_STR_LENGTH);
n=dataSocket->ReceiveDataOnly(&fIndex,sizeof(fIndex));
n=dataSocket->ReceiveDataOnly(&acquisitionIndex,sizeof(acquisitionIndex));
n=dataSocket->ReceiveDataOnly(&frameIndex,sizeof(frameIndex));
n=dataSocket->ReceiveDataOnly(retval,thisDetector->dataBytes);
#ifdef VERBOSE

5
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1528,10 +1528,11 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
* @param acquisitionIndex current acquisition index
* @param frameIndex current frame index (for each scan)
/returns a frame read from recever
*/
int* readFrameFromReceiver(char* fName, int &fIndex);
int* readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex);
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock

5
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -496,10 +496,11 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
* @param acquisitionIndex current acquisition index
* @param frameIndex current frame index (for each scan)
/returns a frame read from recever
*/
virtual int* readFrameFromReceiver(char* fName, int &fIndex)=0;
virtual int* readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex)=0;
/** Sets the read receiver frequency

5
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -628,10 +628,11 @@ virtual int resetFramesCaught()=0;
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
* @param acquisitionIndex current acquisition index
* @param frameIndex current frame index (for each scan)
/returns a frame read from recever
*/
virtual int* readFrameFromReceiver(char* fName, int &fIndex)=0;
virtual int* readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex)=0;
/**