mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 14:38:14 +02:00
float caused error and included header file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@283 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
parent
8b3c4c21eb
commit
980d7ecce0
@ -8,6 +8,7 @@
|
||||
|
||||
#include "slsDetectorUtils.h"
|
||||
#include "energyConversion.h"
|
||||
#include "angleConversionConstant.h"
|
||||
#include "MySocketTCP.h"
|
||||
|
||||
|
||||
|
@ -242,7 +242,7 @@ s
|
||||
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
|
||||
|
||||
|
||||
void registerRawDataCallback(int( *userCallback)(float*, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
|
||||
void registerRawDataCallback(int( *userCallback)(double*, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
|
||||
|
||||
|
||||
|
||||
@ -327,7 +327,7 @@ s
|
||||
int (*dataReady)(detectorData*,void*);
|
||||
void *pCallbackArg;
|
||||
|
||||
int (*rawDataReady)(float*,void*);
|
||||
int (*rawDataReady)(double*,void*);
|
||||
void *pRawDataArg;
|
||||
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user