From 7824719d980327df0bde0de0d785bcc4f24b8b96 Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Mon, 30 Apr 2012 13:19:31 +0000 Subject: [PATCH] some smaller modification to slsDetectorServer git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@175 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetectorServer/slsDetectorFunctionList.h | 1 + .../slsDetectorServer/slsDetectorServer_funcs.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h index a613a61d9..bffcddd2e 100644 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h @@ -22,6 +22,7 @@ Here are the definitions, but the actual implementation should be done for each ****************************************************/ + //if b>0 all the detector must be initialized, otherwise it is just the stop server int initializeDetector(int b); diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index e6c098e20..545e599b1 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -9,7 +9,17 @@ int (*flist[256])(int); //defined in the detector specific file -extern const enum detectorType myDetectorType; +#ifdef MYTHEND +const enum detectorType myDetectorType=MYTHEN; +#elif GOTTHARDD +const enum detectorType myDetectorType=GOTTHARD; +#elif EIGERD +const enum detectorType myDetectorType=EIGER; +#elif PICASSOD +const enum detectorType myDetectorType=PICASSO; +#else +const enum detectorType myDetectorType=GENERIC; +#endif //define in communication_funcs