From bb07b6db7d88f760880dbe7a5eefa21eec2c1732 Mon Sep 17 00:00:00 2001
From: maliakal_d <maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 26 Feb 2013 16:31:55 +0000
Subject: [PATCH] UHRIX Callback function

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@476 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsReceiver/Makefile                  | 4 ++--
 slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp         | 2 ++
 slsDetectorSoftware/slsReceiver/UHRIXCallback.h           | 2 +-
 .../slsReceiver/slsReceiverFunctionList.cpp               | 8 ++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile
index fa8e2d23f..e4a96a288 100644
--- a/slsDetectorSoftware/slsReceiver/Makefile
+++ b/slsDetectorSoftware/slsReceiver/Makefile
@@ -1,9 +1,9 @@
 CC			=	g++ 
-	CLAGS		+=  -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD  #-DTESTWRITE
+	CLAGS		+=  -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -UHRIXCALLBACK  #-DTESTWRITE
 LDLIBS		+= 	-lm  -lstdc++ -lpthread 
 
 INCLUDES	= 	-I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .
-SRC_CLNT	= 	slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp
+SRC_CLNT	= 	slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp
 
 PROGS		= 	slsReceiver 
 DESTDIR		?= 	bin
diff --git a/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp b/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp
index d408c6ada..e33a6d4d0 100644
--- a/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp
+++ b/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp
@@ -1,4 +1,6 @@
 
+#include "UHRIXCallback.h"
+
 
 int UHRIXCallbackDataFunc(char* d, int np, FILE* fd,  void* p){
 	//#ifdef VERBOSE
diff --git a/slsDetectorSoftware/slsReceiver/UHRIXCallback.h b/slsDetectorSoftware/slsReceiver/UHRIXCallback.h
index a61f3f979..64d45ed35 100644
--- a/slsDetectorSoftware/slsReceiver/UHRIXCallback.h
+++ b/slsDetectorSoftware/slsReceiver/UHRIXCallback.h
@@ -1,3 +1,3 @@
-
+#include <iostream>
 
 int UHRIXCallbackDataFunc(char* d, int np, FILE* fd,  void* p);
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 7a36a7193..9ba4537b8 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -11,6 +11,10 @@
 #include "usersFunctions.h"
 #endif
 
+#ifdef UHRIXCALLBACK
+#include "UHRIXCallback.h"
+#endif
+
 #include <signal.h>  		// SIGINT
 #include <sys/stat.h> 		// stat
 #include <sys/socket.h>		// socket(), bind(), listen(), accept(), shut down
@@ -84,6 +88,10 @@ slsReceiverFunctionList::slsReceiverFunctionList(bool shortfname):
 	//to test write receiver data call back
 	registerWriteReceiverDataCallback(&defaultWriteReceiverDataFunc, NULL);
 #endif
+
+#ifdef UHRIXCALLBACK
+	registerWriteReceiverDataCallback(&UHRIXCallbackDataFunc, latestData);
+#endif
 }