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

warnings

Browse Source
This commit is contained in:
maliakal_d 2022-02-23 10:08:50 +01:00
parent 5bfdbf59a2
commit c9abeace8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -995,7 +995,7 @@ int Feb_Control_PrintAcquisitionSetup() {
time_t rawtime; time_t rawtime;
time(&rawtime); time(&rawtime);
struct tm *timeinfo = localtime(&rawtime); struct tm *timeinfo = localtime(&rawtime);
unsigned int dr = 0; int dr = 0;
if (!Feb_Control_GetDynamicRange(&dr)) { if (!Feb_Control_GetDynamicRange(&dr)) {
LOG(logERROR, ("Could not print acquisition set up\n")); LOG(logERROR, ("Could not print acquisition set up\n"));
return 0; return 0;
@ -1178,7 +1178,7 @@ int Feb_Control_SoftwareTrigger(int block) {
} }
// parameters // parameters
int Feb_Control_SetDynamicRange(unsigned int dr) { int Feb_Control_SetDynamicRange(int dr) {
static unsigned int everything_but_bit_mode = DAQ_STATIC_BIT_PROGRAM | static unsigned int everything_but_bit_mode = DAQ_STATIC_BIT_PROGRAM |
DAQ_STATIC_BIT_CHIP_TEST | DAQ_STATIC_BIT_CHIP_TEST |
DAQ_STATIC_BIT_ROTEST; DAQ_STATIC_BIT_ROTEST;
@ -1221,7 +1221,7 @@ int Feb_Control_SetDynamicRange(unsigned int dr) {
return 1; return 1;
} }
int Feb_Control_GetDynamicRange(unsigned int *retval) { int Feb_Control_GetDynamicRange(int *retval) {
if (Feb_Control_subFrameMode & DAQ_NEXPOSURERS_ACTIVATE_AUTO_SUBIMAGING) { if (Feb_Control_subFrameMode & DAQ_NEXPOSURERS_ACTIVATE_AUTO_SUBIMAGING) {
*retval = 32; *retval = 32;
} else if (DAQ_STATIC_BIT_M4 & Feb_Control_staticBits) { } else if (DAQ_STATIC_BIT_M4 & Feb_Control_staticBits) {
@ -1905,7 +1905,7 @@ int64_t Feb_Control_Get_RateTable_Period_in_nsec() {
int Feb_Control_SetRateCorrectionTau(int64_t tau_in_Nsec) { int Feb_Control_SetRateCorrectionTau(int64_t tau_in_Nsec) {
// period = exptime if 16bit, period = subexptime if 32 bit // period = exptime if 16bit, period = subexptime if 32 bit
unsigned int dr = 0; int dr = 0;
if (!Feb_Control_GetDynamicRange(&dr)) { if (!Feb_Control_GetDynamicRange(&dr)) {
LOG(logERROR, ("Could not set rate correction tau\n")); LOG(logERROR, ("Could not set rate correction tau\n"));
return 0; return 0;