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

edited the updatedetector function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@148 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-03-16 15:22:43 +00:00
parent af864279a5
commit bb12fe77d3
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -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);

3
slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c
View File

@ -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

17
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -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);
}