detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

slsReceiver now uses the slsReceiverUsers class

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@501 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2013-04-04 09:46:16 +00:00
parent 4a133d8f6e
commit 34a2f92cb4
10 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsReceiver/Makefile
View File

@ -3,7 +3,7 @@ CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD #-DUHRIXCALLBACK #-DTESTWR
LDLIBS += -lm -lstdc++ -lpthread
INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .
SRC_CLNT = slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp
SRC_CLNT = slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp slsReceiverUsers.cpp
PROGS = slsReceiver
DESTDIR ?= bin

6
slsDetectorSoftware/slsReceiver/slsReceiver.cpp
View File

@ -2,7 +2,7 @@
The port number is passed as an argument */
#include "sls_detector_defs.h"
#include "slsReceiver_funcs.h"
#include "slsReceiverUsers.h"
#include <signal.h> //SIGINT
@ -14,14 +14,14 @@ using namespace std;
void closeFile(int p){
cout<<"close file in receiver"<<endl;
slsReceiverFuncs::closeFile(p);
slsReceiverUsers::closeFile(p);
exit(0);
}
int main(int argc, char *argv[]) {
int ret = slsDetectorDefs::OK;
slsReceiverFuncs *receiver = new slsReceiverFuncs(argc, argv, ret);
slsReceiverUsers *receiver = new slsReceiverUsers(argc, argv, ret);
if(ret==slsDetectorDefs::FAIL)
return -1;

9
slsDetectorSoftware/slsReceiver/slsReceiverUsers.cpp
View File

@ -19,12 +19,14 @@ void slsReceiverUsers::closeFile(int p) {
}
void slsReceiverUsers::registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){slsReceiverList->registerCallBackStartAcquisition(func,arg);};;
void slsReceiverUsers::registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){
receiver->registerCallBackStartAcquisition(func,arg);
}
int slsReceiverUsers::registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){
receiver->registerCallBackAcquisitionFinished(func,arg);
receiver->registerCallBackAcquisitionFinished(func,arg);
}
@ -33,6 +35,3 @@ int slsReceiverUsers::registerCallBackRawDataReady(void (*func)(int, char*, FILE
};
#endif

6
slsDetectorSoftware/slsReceiver/slsReceiverUsers.h
View File

@ -48,7 +48,7 @@ public:
*/
void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){slsReceiverList->registerCallBackStartAcquisition(func,arg);};;
void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg);
/**
@ -58,7 +58,7 @@ public:
*/
int registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){slsReceiverList->registerCallBackAcquisitionFinished(func,arg);};
int registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg);
@ -70,7 +70,7 @@ public:
guidatapointer (NULL, no data required)
*/
int registerCallBackRawDataReady(void (*func)(int, char*, FILE*, char*, void*),void *arg){slsReceiverList->registerCallBackRawDataReady(func,arg);};
int registerCallBackRawDataReady(void (*func)(int, char*, FILE*, char*, void*),void *arg);
private: