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

eiger server works

Browse Source
This commit is contained in:
maliakal_d 2019-01-10 11:03:31 +01:00
parent 55c57e4c3f
commit b5b5ce5c37
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
View File

Binary file not shown.

1
slsDetectorServers/eigerDetectorServer/common.h Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServer/common.h

8
slsDetectorServers/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: e3a0c1373c5dbfd800bb8d20cbca2989222c95ad Repsitory UUID: 55c57e4c3ff61010f12f0b5a1b9a080e103f2ef3
Revision: 15 Revision: 20
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4172 Last Changed Rev: 4213
Last Changed Date: 2018-11-08 17:37:28.000000002 +0100 ./xfs_types.h Last Changed Date: 2019-01-07 12:06:28.000000002 +0100 ./xparameters.h

6
slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "e3a0c1373c5dbfd800bb8d20cbca2989222c95ad" #define GITREPUUID "55c57e4c3ff61010f12f0b5a1b9a080e103f2ef3"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4172 #define GITREV 0x4213
#define GITDATE 0x20181108 #define GITDATE 0x20190107
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2,6 +2,7 @@
#include "gitInfoEiger.h" #include "gitInfoEiger.h"
#include "versionAPI.h" #include "versionAPI.h"
#include "logger.h" #include "logger.h"
#include "common.h"
#ifndef VIRTUAL #ifndef VIRTUAL
#include "FebControl.h" #include "FebControl.h"
@ -117,7 +118,7 @@ void basictests() {
"Detector MAC Addr:\t\t 0x%llx\n" "Detector MAC Addr:\t\t 0x%llx\n"
"Firmware Version:\t\t %lld\n" "Firmware Version:\t\t %lld\n"
"Software Version:\t\t %llx\n" "Software Version:\t\t 0x%llx\n"
"F/w-S/w API Version:\t\t %lld\n" "F/w-S/w API Version:\t\t %lld\n"
"Required Firmware Version:\t %d\n" "Required Firmware Version:\t %d\n"
"Client-Software API Version:\t 0x%llx\n" "Client-Software API Version:\t 0x%llx\n"
@ -412,7 +413,6 @@ void setupDetector() {
FILE_LOG(logINFOBLUE, ("Setting Default Dac values\n")); FILE_LOG(logINFOBLUE, ("Setting Default Dac values\n"));
{ {
int i = 0; int i = 0;
int retval[2]={-1,-1};
const int defaultvals[NDAC] = DEFAULT_DAC_VALS; const int defaultvals[NDAC] = DEFAULT_DAC_VALS;
for(i = 0; i < NDAC; ++i) { for(i = 0; i < NDAC; ++i) {
setDAC((enum DACINDEX)i,defaultvals[i],0); setDAC((enum DACINDEX)i,defaultvals[i],0);
@ -925,9 +925,6 @@ int setModule(sls_detector_module myMod, char* mess) {
int getModule(sls_detector_module *myMod) { int getModule(sls_detector_module *myMod) {
#ifndef VIRTUAL #ifndef VIRTUAL
int i;
int retval[2];
//trimbits //trimbits
unsigned int* tt; unsigned int* tt;
tt = Feb_Control_GetTrimbits(); tt = Feb_Control_GetTrimbits();
@ -1054,11 +1051,12 @@ int getDAC(enum DACINDEX ind, int mV) {
(ret[2]==ret[3]) && (ret[2]==ret[3]) &&
(ret[3]==ret[4])) { (ret[3]==ret[4])) {
FILE_LOG(logINFO, ("\tvthreshold match\n")); FILE_LOG(logINFO, ("\tvthreshold match\n"));
return ret[0];
} else { } else {
FILE_LOG(logERROR, ("\tvthreshold mismatch vcmp_ll:%d vcmp_lr:%d vcmp_rl:%d vcmp_rr:%d vcp:%d\n", FILE_LOG(logERROR, ("\tvthreshold mismatch vcmp_ll:%d vcmp_lr:%d vcmp_rl:%d vcmp_rr:%d vcp:%d\n",
ret[0],ret[1],ret[2],ret[3], ret[4])); ret[0],ret[1],ret[2],ret[3], ret[4]));
return -1;
} }
return;
} }
if (!mV) { if (!mV) {

5
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -74,7 +74,10 @@ enum {E_PARALLEL, E_NON_PARALLEL, E_SAFE};
#define DEFAULT_TEST_MODE (0) #define DEFAULT_TEST_MODE (0)
#define DEFAULT_HIGH_VOLTAGE (0) #define DEFAULT_HIGH_VOLTAGE (0)
#define DAC_MAX_VOLTAGE_MV (2048) #define DAC_MIN_MV (0)
#define DAC_MAX_MV (2048)
#define LTC2620_MIN_VAL (0) // including LTC defines instead of LTC262.h (includes bit banging and blackfin read and write)
#define LTC2620_MAX_VAL (4095) // 12 bits
#define DAC_MAX_STEPS (4096) #define DAC_MAX_STEPS (4096)
#define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS (0x1FFFFFFF) /** 29 bit register for max subframe exposure value */ #define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS (0x1FFFFFFF) /** 29 bit register for max subframe exposure value */

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1884,7 +1884,7 @@ int set_speed(int file_des) {
enum speedVariable ind = args[0]; enum speedVariable ind = args[0];
int val = args[1]; int val = args[1];
int GET_VAL = -1; int GET_VAL = -1;
if ((ind == PHASESHIFT) || (val == ADC_PHASE) || (val == DBIT_PHASE)) if ((ind == PHASE_SHIFT) || (val == ADC_PHASE) || (val == DBIT_PHASE))
GET_VAL = 100000; GET_VAL = 100000;
char speedName[20] = {0}; char speedName[20] = {0};