receiver complete change.dont check out

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@685 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-11-14 12:32:56 +00:00
parent 1673da0854
commit 68ae219125
6 changed files with 511 additions and 300 deletions

View File

@ -51,7 +51,7 @@ public:
/**
* Returns status of receiver: idle, running or error
*/
runStatus getStatus(){return status;};
runStatus getStatus(){ return status;};
/**
* Returns File Name
@ -71,12 +71,12 @@ public:
/**
* Returns Frames Caught for each real time acquisition (eg. for each scan)
*/
uint32_t getFramesCaught(){return framesCaught;};
int getFramesCaught(){return framesCaught;};
/**
* Returns Total Frames Caught for an entire acquisition (including all scans)
*/
uint32_t getTotalFramesCaught(){return totalFramesCaught;};
int getTotalFramesCaught(){return totalFramesCaught;};
/**
* Returns the frame index at start of each real time acquisition (eg. for each scan)
@ -209,18 +209,21 @@ public:
void startReadout();
/** enabl data compression, by saving only hits */
void enableDataCompression(bool enable){dataCompression = enable;};
void enableDataCompression(bool enable){dataCompression = enable;filter->enableCompression(enable);};
/** get data compression, by saving only hits */
bool getDataCompression(){ return dataCompression;};
/** Set Number of Jobs Per Thread */
void setNumberOfJobsPerThread(int i){userDefinedNumJobsPerThread = i; numJobsPerThread = i;};
private:
/** detector type */
detectorType myDetectorType;
/** max frames per file **/
uint32_t maxFramesPerFile;
int maxFramesPerFile;
/** File write enable */
int enableFileWrite;
@ -241,7 +244,7 @@ private:
int frameIndexNeeded;
/** Frames Caught for each real time acquisition (eg. for each scan) */
uint32_t framesCaught;
int framesCaught;
/* Acquisition started */
bool acqStarted;
@ -268,7 +271,7 @@ private:
uint32_t acquisitionIndex;
/** Packets currently in current file, starts new file when it reaches max */
uint32_t packetsInFile;
int packetsInFile;
/** Previous Frame number from buffer */
uint32_t prevframenum;
@ -328,10 +331,10 @@ private:
int shortFrame;
/** buffer size can be 1286*2 or 518 or 1286*40 */
uint32_t bufferSize;
int bufferSize;
/** number of packets per frame*/
uint32_t packetsPerFrame;
int packetsPerFrame;
/** gui data ready */
int guiDataReady;
@ -369,6 +372,12 @@ private:
/** guiDataReady mutex */
pthread_mutex_t dataReadyMutex;
/** Number of jobs per thread for data compression */
int numJobsPerThread;
/** user defined number of jobs per thread for data compression */
int userDefinedNumJobsPerThread;
/**
callback arguments are
filepath
@ -412,6 +421,7 @@ private:
int cbAction;
public:
/** File Descriptor */
static FILE *sfilefd;