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

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-09 17:51:36 +02:00
parent f8b62bba64
commit 652d29f2d9
13 changed files with 441 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -245,10 +245,10 @@ class multiSlsDetector : public slsDetectorUtils {
* Creates all the threads in the threadpool
\returns OK or FAIL
*/
int createThreadPool();
int createThreadPool(ThreadPool** t);
/** destroys all the threads in the threadpool */
void destroyThreadPool();
void destroyThreadPool(ThreadPool** t);
/** frees the shared memory occpied by the sharedMultiSlsDetector structure */
int freeSharedMemory() ;
@ -1180,14 +1180,9 @@ class multiSlsDetector : public slsDetectorUtils {
int resetFramesCaught();
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param acquisitionIndex current acquisition index
* @param frameIndex current frame index (for each scan)
* @param subFrameIndex current sub frame index (for 32 bit mode for eiger)
/returns a frame read from recever
* Reads frames from receiver through a constant socket
*/
int* readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex, int &subFrameIndex);
void readFrameFromReceiver();
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock
@ -1378,7 +1373,7 @@ class multiSlsDetector : public slsDetectorUtils {
private:
ThreadPool* threadpool;
ThreadPool* zmqthreadpool;
};