detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

float caused error and included header file

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@283 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-03 12:58:25 +00:00
parent 8b3c4c21eb
commit 980d7ecce0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -8,6 +8,7 @@
#include "slsDetectorUtils.h" #include "slsDetectorUtils.h"
#include "energyConversion.h" #include "energyConversion.h"
#include "angleConversionConstant.h"
#include "MySocketTCP.h" #include "MySocketTCP.h"

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -242,7 +242,7 @@ s
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;}; 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*); int (*dataReady)(detectorData*,void*);
void *pCallbackArg; void *pCallbackArg;
int (*rawDataReady)(float*,void*); int (*rawDataReady)(double*,void*);
void *pRawDataArg; void *pRawDataArg;
}; };