mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 12:27:14 +02:00
almost done
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
#include <sstream>
|
||||
#include <queue>
|
||||
#include <math.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
|
||||
class postProcessingFuncs;
|
||||
|
||||
@ -300,11 +300,7 @@ s
|
||||
/** data queue size */
|
||||
int queuesize;
|
||||
|
||||
/** queue mutex */
|
||||
sem_t sem_queue;
|
||||
|
||||
/** set when detector finishes acquiring */
|
||||
int acquiringDone;
|
||||
|
||||
|
||||
/**
|
||||
@ -333,18 +329,23 @@ s
|
||||
|
||||
|
||||
|
||||
private:
|
||||
double *fdata;
|
||||
|
||||
int (*dataReady)(detectorData*,int, int,void*);
|
||||
void *pCallbackArg;
|
||||
detectorData *thisData;
|
||||
|
||||
private:
|
||||
// double *fdata;
|
||||
|
||||
// int (*dataReady)(detectorData*,int, int,void*);
|
||||
// void *pCallbackArg;
|
||||
|
||||
int (*rawDataReady)(double*,int,void*);
|
||||
void *pRawDataArg;
|
||||
|
||||
|
||||
postProcessingFuncs *ppFun;
|
||||
detectorData *thisData;
|
||||
//detectorData *thisData;
|
||||
|
||||
|
||||
double *ang;
|
||||
@ -374,4 +375,5 @@ s
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user