From bb12fe77d37a5c9848fee3a8e3db39280a240f46 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 16 Mar 2012 15:22:43 +0000 Subject: [PATCH] edited the updatedetector function git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@148 951219d9-93cf-4727-9268-0efd64621fa3 --- .../gotthardDetectorServer/firmware_funcs.c | 1 + .../gotthardDetectorServer/mcb_funcs.c | 3 +-- .../gotthardDetectorServer/server_funcs.c | 17 +++++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c index 58ff32177..73d83a621 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c @@ -1676,6 +1676,7 @@ u_int32_t* fifo_read_event() #ifdef VERBOSE printf("before readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); #endif + //added+2 for creating ram_values memory dma_memcpy(now_ptr,values ,dataBytes); //memcpy(now_ptr,values ,dataBytes); diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c index 4d0afed5f..1a243bf54 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c @@ -837,8 +837,7 @@ int initDACs(int* v,int imod) -int setSettings(int i, int imod) -{ +int setSettings(int i, int imod) { #ifdef VERBOSE printf("\ninside set settings wit settins=%d...\n",i); #endif diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 1427ed2bf..85fecab92 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -2692,19 +2692,16 @@ int send_update(int file_des) { int thr, n; //int it; int64_t retval, tns=-1; - - n = sendDataOnly(file_des,lastClientIP,sizeof(lastClientIP)); - /* n = sendDataOnly(file_des,&nModX,sizeof(nModX)); n = sendDataOnly(file_des,&nModY,sizeof(nModY)); n = sendDataOnly(file_des,&dynamicRange,sizeof(dynamicRange)); n = sendDataOnly(file_des,&dataBytes,sizeof(dataBytes)); - t=setSettings(GET_SETTINGS); + t=setSettings(GET_SETTINGS,-1); n = sendDataOnly(file_des,&t,sizeof(t)); - thr=getThresholdEnergy(); - n = sendDataOnly(file_des,&thr,sizeof(thr)); - retval=setFrames(tns); +/* thr=getThresholdEnergy(); + n = sendDataOnly(file_des,&thr,sizeof(thr));*/ + retval=setFrames(tns); n = sendDataOnly(file_des,&retval,sizeof(int64_t)); retval=setExposureTime(tns); n = sendDataOnly(file_des,&retval,sizeof(int64_t)); @@ -2714,11 +2711,11 @@ int send_update(int file_des) { n = sendDataOnly(file_des,&retval,sizeof(int64_t)); retval=setGates(tns); n = sendDataOnly(file_des,&retval,sizeof(int64_t)); - retval=setProbes(tns); - n = sendDataOnly(file_des,&retval,sizeof(int64_t)); +/* retval=setProbes(tns); + n = sendDataOnly(file_des,&retval,sizeof(int64_t));*/ retval=setTrains(tns); n = sendDataOnly(file_des,&retval,sizeof(int64_t)); - */ + if (lockStatus==0) { strcpy(lastClientIP,thisClientIP); }