detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +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
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
#include <stdlib.h>
#include "LocalLinkInterface.h"
#include "slsDetectorServer_defs.h"
#include <stdlib.h>
struct BebInfo {
unsigned int beb_number;

4
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1841,10 +1841,10 @@ int Feb_Control_PrepareForAcquisition() { // return 1;
reg_nums[5] = DAQ_REG_SUBFRAME_EXPOSURES;
reg_vals[5] =
Feb_Control_subframe_exposure_time_in_10nsec; //(1 means 10ns, 100 means
//1000ns)
// 1000ns)
reg_nums[6] = DAQ_REG_SUBFRAME_PERIOD;
reg_vals[6] = Feb_Control_subframe_period_in_10nsec; //(1 means 10ns, 100
//means 1000ns)
// means 1000ns)
// if
// (!Feb_Interface_WriteRegisters((Module_GetTopLeftAddress(&modules[1])|Module_GetTopRightAddress(&modules[1])),20,reg_nums,reg_vals,0,0))
// {

7
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1940,7 +1940,7 @@ void *start_timer(void *arg) {
sls_detector_header *header =
(sls_detector_header *)(packetData);
header->detType = 3; //(uint16_t)myDetectorType; updated
//when firmware updates
// when firmware updates
header->version = SLS_DETECTOR_HEADER_VERSION - 1;
header->frameNumber = frameNr + iframes;
header->packetNumber = i;
@ -1951,7 +1951,7 @@ void *start_timer(void *arg) {
memset(packetData2, 0, packetsize);
header = (sls_detector_header *)(packetData2);
header->detType = 3; //(uint16_t)myDetectorType; updated
//when firmware updates
// when firmware updates
header->version = SLS_DETECTOR_HEADER_VERSION - 1;
header->frameNumber = frameNr + iframes;
header->packetNumber = i;
@ -2090,7 +2090,8 @@ int startReadOut() {
break;
// for(i=0;i<nimages_per_request;i++)
// 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;
on_dst %= ndsts_in_use;