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

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

2
slsDetectorServers/jungfrauDetectorServer/Makefile
View File

@ -1,6 +1,6 @@
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -DJUNGFRAUD -DSLS_DETECTOR_FUNCTION_LIST -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -DJUNGFRAUD -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++
PROGS = jungfrauDetectorServer

2
slsDetectorServers/jungfrauDetectorServer/Makefile.virtual
View File

@ -1,5 +1,5 @@
CC = gcc
CFLAGS += -Wall -DJUNGFRAUD -DVIRTUAL -DSLS_DETECTOR_FUNCTION_LIST -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -DJUNGFRAUD -DVIRTUAL -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++ -pthread
PROGS = jungfrauDetectorServer_virtual

10
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1,8 +1,6 @@
//#ifdef SLS_DETECTOR_FUNCTION_LIST
#include "slsDetectorFunctionList.h"
#include "gitInfoJungfrau.h"
#ifndef VIRTUAL
#include "AD9257.h" // include "commonServerFunctions.h", which in turn includes "blackfin.h"
#include "programfpga.h"
#include "versionAPI.h"
@ -1715,9 +1713,3 @@ int getNumberOfADCs(){return NADC;}
int getNumberOfChannelsPerChip(){return NCHAN;}
//#endif

8
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -253,8 +253,8 @@ void function_table() {
int iloop = 0;
for (iloop = 0; iloop < NUM_DET_FUNCTIONS ; ++iloop) {
FILE_LOG(logDEBUG1, ("function fnum=%d, (%s) located at 0x%x\n", iloop,
getFunctionName((enum detFuncs)iloop), (unsigned int)flist[iloop]));
FILE_LOG(logDEBUG1, ("function fnum=%d, (%s)\n", iloop,
getFunctionName((enum detFuncs)iloop)));
}
}
@ -289,10 +289,10 @@ void validate64(int64_t arg, int64_t retval, char* modename, int hex) {
ret = FAIL;
if (hex)
sprintf(mess, "Could not %s. Set 0x%llx, but read 0x%llx\n",
modename, arg, retval);
modename, (long long unsigned int)arg, (long long unsigned int)retval);
else
sprintf(mess, "Could not %s. Set %lld, but read %lld\n",
modename, arg, retval);
modename, (long long unsigned int)arg, (long long unsigned int)retval);
FILE_LOG(logERROR,(mess));
}
}