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

virtual eiger server compiled

Browse Source
This commit is contained in:
maliakal_d
2018-10-31 15:13:31 +01:00
parent 17027962ea
commit 92123069ce
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

9
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1,6 +1,6 @@
#include "slsDetectorFunctionList.h"
#ifndef VIRTUAL
#include "gitInfoEiger.h"
#ifndef VIRTUAL
#include "FebControl.h"
#include "Beb.h"
#include "versionAPI.h"
@ -1370,12 +1370,13 @@ int64_t setRateCorrection(int64_t custom_tau_in_nsec) {//in nanosec (will never
//same setting
if ((tau_in_nsec == custom_tau_in_nsec) && (ratetable_period_in_nsec == actual_period)) {
if (eiger_dynamicrange == 32)
if (eiger_dynamicrange == 32) {
FILE_LOG(logINFO, ("Rate Table already created before: Same Tau %lldns, Same subexptime %lldns\n",
(long long int)tau_in_nsec,(long long int)ratetable_period_in_nsec));
else
} else {
FILE_LOG(logINFO, ("Rate Table already created before: Same Tau %lldns, Same exptime %lldns\n",
(long long int)tau_in_nsec,(long long int)ratetable_period_in_nsec));
}
}
//different setting, calculate table
else {
@ -1603,7 +1604,7 @@ int startStateMachine() {
eiger_virtual_status = 0;
return FAIL;
}
FILE_LOG(logINFO ,"***Virtual Acquisition started\n");
FILE_LOG(logINFO ,("Virtual Acquisition started\n"));
return OK;
#else