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

almost compiling on 64bit...

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@297 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-16 14:50:05 +00:00
parent 0c89b0986f
commit 6fb6f72bc3
18 changed files with 408 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -184,12 +184,12 @@ s
int dataQueueSize();
/**
pops the data from thepostprocessed data queue
\returns pointer to the popped data or NULL if the queue is empty.
\sa finalDataQueue
*/
detectorData* popFinalDataQueue();
/* /\** */
/* pops the data from thepostprocessed data queue */
/* \returns pointer to the popped data or NULL if the queue is empty. */
/* \sa finalDataQueue */
/* *\/ */
/* detectorData* popFinalDataQueue(); */
int checkJoinThread();
@ -202,11 +202,11 @@ s
*/
void resetDataQueue();
/**
resets the postprocessed data queue
\sa finalDataQueue
*/
void resetFinalDataQueue();
/* /\** */
/* resets the postprocessed data queue */
/* \sa finalDataQueue */
/* *\/ */
/* void resetFinalDataQueue(); */
@ -238,7 +238,7 @@ s
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
void registerRawDataCallback(int( *userCallback)(double*, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
@ -251,6 +251,15 @@ s
int setCurrentPosition(double v) { pthread_mutex_lock(&mp); currentPosition=v; pthread_mutex_unlock(&mp); return currentPosition;};
void initDataset(int refresh);
void addFrame(double *data, double pos, double i0, double t, string fname, double var);
void finalizeDataset(double *a, double *v, double *e, int &np);
protected:
int *threadedProcessing;
@ -322,7 +331,7 @@ s
int (*dataReady)(detectorData*,void*);
void *pCallbackArg;
int (*rawDataReady)(double*,void*);
int (*rawDataReady)(double*,int,void*);
void *pRawDataArg;
@ -334,6 +343,7 @@ s
double *val;
double *err;
int numberOfChannels;