detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-08 19:10: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;

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_nums[5] = DAQ_REG_SUBFRAME_EXPOSURES;
reg_vals[5] = reg_vals[5] =
Feb_Control_subframe_exposure_time_in_10nsec; //(1 means 10ns, 100 means Feb_Control_subframe_exposure_time_in_10nsec; //(1 means 10ns, 100 means
//1000ns) // 1000ns)
reg_nums[6] = DAQ_REG_SUBFRAME_PERIOD; reg_nums[6] = DAQ_REG_SUBFRAME_PERIOD;
reg_vals[6] = Feb_Control_subframe_period_in_10nsec; //(1 means 10ns, 100 reg_vals[6] = Feb_Control_subframe_period_in_10nsec; //(1 means 10ns, 100
//means 1000ns) // means 1000ns)
// if // if
// (!Feb_Interface_WriteRegisters((Module_GetTopLeftAddress(&modules[1])|Module_GetTopRightAddress(&modules[1])),20,reg_nums,reg_vals,0,0)) // (!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 *header =
(sls_detector_header *)(packetData); (sls_detector_header *)(packetData);
header->detType = 3; //(uint16_t)myDetectorType; updated header->detType = 3; //(uint16_t)myDetectorType; updated
//when firmware updates // when firmware updates
header->version = SLS_DETECTOR_HEADER_VERSION - 1; header->version = SLS_DETECTOR_HEADER_VERSION - 1;
header->frameNumber = frameNr + iframes; header->frameNumber = frameNr + iframes;
header->packetNumber = i; header->packetNumber = i;
@ -1951,7 +1951,7 @@ void *start_timer(void *arg) {
memset(packetData2, 0, packetsize); memset(packetData2, 0, packetsize);
header = (sls_detector_header *)(packetData2); header = (sls_detector_header *)(packetData2);
header->detType = 3; //(uint16_t)myDetectorType; updated header->detType = 3; //(uint16_t)myDetectorType; updated
//when firmware updates // when firmware updates
header->version = SLS_DETECTOR_HEADER_VERSION - 1; header->version = SLS_DETECTOR_HEADER_VERSION - 1;
header->frameNumber = frameNr + iframes; header->frameNumber = frameNr + iframes;
header->packetNumber = i; header->packetNumber = i;
@ -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;

9
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -880,10 +880,11 @@ 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 =
0.5; // because of the master delay of 62 ns (not really double of (val * 1E-9 * CLK_FREQ) +
// clkfreq), losing precision and 0 delay becomes -31ns, so adding 0.5; // because of the master delay of 62 ns (not really double of
// +0.5. Also adding +0.5 for more tolerance for gotthard1. // clkfreq), losing precision and 0 delay becomes -31ns, so adding
// +0.5. Also adding +0.5 for more tolerance for gotthard1.
set64BitReg(val, SET_DELAY_LSB_REG, SET_DELAY_MSB_REG); set64BitReg(val, SET_DELAY_LSB_REG, SET_DELAY_MSB_REG);
// validate for tolerance // validate for tolerance

2
slsDetectorServers/slsDetectorServer/src/I2C.c
View File

@ -106,7 +106,7 @@
/** Receive Data Fifo Level register */ /** Receive Data Fifo Level register */
//#define I2C_RX_DATA_FIFO_LVL_OFST (0) //#define I2C_RX_DATA_FIFO_LVL_OFST (0)
//#define I2C_RX_DATA_FIFO_LVL_MSK (0x000000FF << //#define I2C_RX_DATA_FIFO_LVL_MSK (0x000000FF <<
//I2C_RX_DATA_FIFO_LVL_OFST) // I2C_RX_DATA_FIFO_LVL_OFST)
// defines in the fpga // defines in the fpga
uint32_t I2C_Control_Reg = 0x0; uint32_t I2C_Control_Reg = 0x0;

2
slsDetectorServers/slsDetectorServer/src/LTC2620.c
View File

@ -247,7 +247,7 @@ int LTC2620_SetDACValue(int dacnum, int val, int mV, int *dacval) {
} else if (val >= 0 && dacnum <= ndacsonly) { } else if (val >= 0 && dacnum <= ndacsonly) {
// do not convert power down dac val // do not convert power down dac val
//(if not ndacsonly (pwr/vchip): dont need to print mV value as it will //(if not ndacsonly (pwr/vchip): dont need to print mV value as it will
//be wrong (wrong limits)) // be wrong (wrong limits))
ret = LTC2620_DacToVoltage(val, &dacmV); ret = LTC2620_DacToVoltage(val, &dacmV);
} }

20
slsSupportLib/include/versionAPI.h
View File

@ -1,13 +1,13 @@
/** API versions */ /** API versions */
#define GITBRANCH "setrxhostname" #define GITBRANCH "setrxhostname"
#define APILIB 0x200409 #define APILIB 0x200409
#define APIRECEIVER 0x200409 #define APIRECEIVER 0x200409
#define APIGUI 0x200409 #define APIGUI 0x200409
#define APICTB 0x200508 #define APICTB 0x200508
#define APIGOTTHARD 0x200508 #define APIGOTTHARD 0x200508
#define APIGOTTHARD2 0x200508 #define APIGOTTHARD2 0x200508
#define APIJUNGFRAU 0x200508 #define APIJUNGFRAU 0x200508
#define APIMYTHEN3 0x200508 #define APIMYTHEN3 0x200508
#define APIMOENCH 0x200508 #define APIMOENCH 0x200508
#define APIEIGER 0x200508 #define APIEIGER 0x200508