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

formatted servers

Browse Source
This commit is contained in:
maliakal_d 2020-05-08 13:56:47 +02:00
parent dac9998161
commit ab5cad4fde
7 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/eigerDetectorServer/Beb.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <stdlib.h>
#include "LocalLinkInterface.h" #include "LocalLinkInterface.h"
#include "slsDetectorServer_defs.h" #include "slsDetectorServer_defs.h"
#include <stdlib.h>
struct BebInfo { struct BebInfo {
unsigned int beb_number; unsigned int beb_number;

3
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2090,7 +2090,8 @@ int startReadOut() {
break; break;
// for(i=0;i<nimages_per_request;i++) // for(i=0;i<nimages_per_request;i++)
// if ((ret_val = // if ((ret_val =
//(!Beb_RequestNImages(beb_num,send_to_ten_gig,on_dst,1,0)))) break; //(!Beb_RequestNImages(beb_num,send_to_ten_gig,on_dst,1,0))))
//break;
dst_requested[on_dst++] = 0; dst_requested[on_dst++] = 0;
on_dst %= ndsts_in_use; on_dst %= ndsts_in_use;

3
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -880,7 +880,8 @@ int setDelayAfterTrigger(int64_t val) {
val += masterdefaultdelay; val += masterdefaultdelay;
LOG(logINFO, ("\tActual Delay (master): %lld\n", (long long int)val)); LOG(logINFO, ("\tActual Delay (master): %lld\n", (long long int)val));
} }
val = (val * 1E-9 * CLK_FREQ) + val =
(val * 1E-9 * CLK_FREQ) +
0.5; // because of the master delay of 62 ns (not really double of 0.5; // because of the master delay of 62 ns (not really double of
// clkfreq), losing precision and 0 delay becomes -31ns, so adding // clkfreq), losing precision and 0 delay becomes -31ns, so adding
// +0.5. Also adding +0.5 for more tolerance for gotthard1. // +0.5. Also adding +0.5 for more tolerance for gotthard1.