From 980d7ecce046f6d27b34b157a538266fad6b7fa4 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Wed, 3 Oct 2012 12:58:25 +0000 Subject: [PATCH] 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 --- slsDetectorSoftware/slsDetector/slsDetector.h | 1 + slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 926e51dc3..0c700e1ab 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -8,6 +8,7 @@ #include "slsDetectorUtils.h" #include "energyConversion.h" +#include "angleConversionConstant.h" #include "MySocketTCP.h" diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h index 6fab4f08f..ceef57031 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.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; };