detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 20:39:22 +01:00
Code Issues Actions Packages Releases Activity

rate correction for eiger implemented

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-02-10 11:24:49 +01:00
parent 9067da5e88 5029eb0c86
commit 3c4b0c24c8
5 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@@ -174,7 +174,7 @@ void Feb_Control_FebControl(){
int Feb_Control_Init(int master, int top){
int Feb_Control_Init(int master, int top, int module_num){
unsigned int i;
Feb_Control_module_number = 0;
Feb_Control_current_index = 0;
@@ -182,19 +182,7 @@ int Feb_Control_Init(int master, int top){
//global send
Feb_Control_AddModule1(0,1,0xff,0,1);
Feb_Control_PrintModuleList();
//get module nummber
int res=0;
char hostname[100];
if (gethostname(hostname, sizeof hostname) == 0)
puts(hostname);
else
perror("gethostname");
char *pch;
pch = strtok(hostname,"0");
pch = strtok(NULL,"0");
sscanf(pch,"%d",&res);
Feb_Control_module_number = (res & 0xFF);
Feb_Control_module_number = (module_num & 0xFF);
int serial = !top;

2
slsDetectorSoftware/eigerDetectorServer/FebControl.h
View File

@@ -111,7 +111,7 @@ int Feb_Control_GetModuleNumber();
void Feb_Control_FebControl();
int Feb_Control_Init(int master, int top);
int Feb_Control_Init(int master, int top, int module_num);
int Feb_Control_ReadSetUpFileToAddModules(char* file_name);
int Feb_Control_ReadSetUpFile(unsigned int module_num, char* file_name);
int Feb_Control_CheckSetup();

4
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -140,7 +140,7 @@ int initDetector(){
getModuleConfiguration();
Feb_Interface_FebInterface();
Feb_Control_FebControl();
Feb_Control_Init(master,top);
Feb_Control_Init(master,top,getDetectorNumber());
printf("FEB Initialization done\n");
Beb_Beb();
printf("BEB Initialization done\n");
@@ -181,7 +181,7 @@ int initDetectorStop(){
getModuleConfiguration();
Feb_Interface_FebInterface();
Feb_Control_FebControl();
Feb_Control_Init(master,top);
Feb_Control_Init(master,top,getDetectorNumber());
printf("FEB Initialization done\n");
/* Beb_Beb(-1);
printf("BEB constructor done\n");*/