makefile updated to include the receiver in the library

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@502 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h

@@ -1,4 +1,5 @@
-#ifdef SLS_RECEIVER_FUNCTION_LIST
+//#ifdef SLS_RECEIVER_FUNCTION_LIST
+
 #ifndef SLS_RECEIVER_FUNCTION_LIST_H
 #define SLS_RECEIVER_FUNCTION_LIST_H
 /********************************************//**
@@ -391,4 +392,4 @@ public:
 
 #endif
 
-#endif
+//#endif

slsDetectorSoftware/slsReceiver/slsReceiverUsers.cpp

@@ -32,6 +32,6 @@ int slsReceiverUsers::registerCallBackAcquisitionFinished(void (*func)(int, void
 
 int slsReceiverUsers::registerCallBackRawDataReady(void (*func)(int, char*, FILE*, char*, void*),void *arg){
   receiver->registerCallBackRawDataReady(func,arg);
-};
+}
 
 

slsDetectorSoftware/slsReceiver/slsReceiverUsers.h

@@ -1,8 +1,4 @@
-  /********************************************//**
- * @file slsReceiverUsers.h
- * @short API for implementing the SLS data receiver in the users application. Callbacks can be defined for processing and/or saving data
- * 
- ***********************************************/
+
 #ifndef SLS_RECEIVER_USERS_H
 #define SLS_RECEIVER_USERS_H
 
@@ -10,8 +6,17 @@
 
 class slsReceiverFuncs;
 
+  /** 
+@short Class for implementing the SLS data receiver in the users application. Callbacks can be defined for processing and/or saving data
+  */
+/** 
 
 
+ @libdoc slsReceiverUsers is a class that can be instantiated in the users software to receive the data from the detectors. Callbacks can be defined for processing and/or saving data
+
+
+ ***********************************************/
+
 class slsReceiverUsers {
 
 public:
@@ -35,42 +40,35 @@ public:
 	void start();
 
 	/**
-	   callback arguments are
-	   filepath
-	   filename
-	   fileindex
-	   data size
+
+	@sort register calbback for starting the acquisition 
+	 \param func  callback to be called when starting the acquisition. Its arguments are filepath filename fileindex data size
 	   
-	   return value is 
-	   0 callback takes care of open,close,wrie file
-	   1 callback writes file, we have to open, close it
-	   2 we open, close, write file, callback does not do anything
+	  \returns	   0 callback takes care of open,close,write file; 	   1 callback writes file, we have to open, close it; 2 we open, close, write file, callback does not do anything
 
 	*/
 	
-	void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg);
+	void registerCallBackStartAcquisition(int (*func)(char* filepath, char* filename,int fileindex, int datasize, void*),void *arg);
 
 
-	/**
-	  callback argument is
-	  total frames caught
-
+	/**	
+	   @sort register callback for end of acquisition 
+	  \param func end of acquisition callback. Argument nf is total frames caught
+	  \returns nothing
 	*/
 	
 	
-	int registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg);
+	int registerCallBackAcquisitionFinished(void (*func)(int nf, void*),void *arg);
 	
 
 
 	/**
-	  args to raw data ready callback are
-	  framenum
-	  datapointer
-	  file descriptor
-	  guidatapointer (NULL, no data required)
+	   @sort register callback to be called when data are available (to process and/or save the data).
+	   \param func raw data ready callback. arguments are framenum datapointer  file descriptor guidatapointer (NULL, no data required)
+	  \returns nothing
 	*/
 	
-	int registerCallBackRawDataReady(void (*func)(int, char*, FILE*, char*, void*),void *arg);
+	int registerCallBackRawDataReady(void (*func)(int framenumber, char* datapointer, FILE* filedescriptor, char* guidatapointer, void*),void *arg);
 
 
  private:

slsDetectorSoftware/slsReceiver/slsReceiver_funcs.h

@@ -10,7 +10,6 @@
 #include "MySocketTCP.h"
 #include "slsReceiverFunctionList.h"
 
-class slsReceiverFunctionList;
 
 
 /**