detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

timing command added, several bugs concerning the synchronization of multiple detectors fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@134 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-02-28 13:59:28 +00:00
parent b755c533f0
commit 5e086b9ee6
10 changed files with 241 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -58,13 +58,16 @@ int init_detector( int b) {
#endif
#endif
testFpga();
#ifdef MCB_FUNCS
if (b) {
#ifdef MCB_FUNCS
initDetector();
setSettings(GET_SETTINGS);
testRAM();
}
#endif
setTiming(GET_EXTERNAL_COMMUNICATION_MODE);
setMaster(GET_MASTER);
setSynchronization(GET_SYNCHRONIZATION_MODE);
}
strcpy(mess,"dummy message");
strcpy(lastClientIP,"none");
strcpy(thisClientIP,"none1");
@ -1313,7 +1316,7 @@ int set_module(int file_des) {
float *myAdc=malloc(NADC*sizeof(int));
int retval, n;
int ret=OK;
int dr, ow;
int dr;//, ow;
dr=setDynamicRange(-1);
@ -2624,7 +2627,7 @@ int send_update(int file_des) {
int ret=OK;
enum detectorSettings t;
int thr, n;
int it;
// int it;
int64_t retval, tns=-1;
@ -2678,7 +2681,7 @@ int set_master(int file_des) {
enum masterFlags arg;
int n;
int ret=OK;
int regret=OK;
// int regret=OK;
sprintf(mess,"can't set master flags\n");
@ -2725,7 +2728,7 @@ int set_synchronization(int file_des) {
enum synchronizationMode arg;
int n;
int ret=OK;
int regret=OK;
//int regret=OK;
sprintf(mess,"can't set synchronization mode\n");