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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-15 10:29:50 +02:00
parent e0b86799ae
commit 24af0ee578
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -126,7 +126,7 @@ void Feb_Control_FebControl() {
moduleSize = 0; moduleSize = 0;
} }
int Feb_Control_Init(int master, int top, int normal, int module_num) { int Feb_Control_Init(int master, int normal, int module_num) {
Feb_Control_module_number = 0; Feb_Control_module_number = 0;
Feb_Control_current_index = 0; Feb_Control_current_index = 0;
Feb_control_master = master; Feb_control_master = master;
@ -135,29 +135,19 @@ int Feb_Control_Init(int master, int top, int normal, int module_num) {
// global send // global send
Feb_Control_AddModule(0, 0xff); Feb_Control_AddModule(0, 0xff);
Feb_Control_PrintModuleList(); Feb_Control_PrintModuleList();
Feb_Control_module_number = (module_num & 0xFF);
int serial = !top;
LOG(logDEBUG1, ("serial: %d\n", serial));
Feb_Control_current_index = 1;
// Add the half module // Add the half module
Feb_Control_AddModule(Feb_Control_module_number, serial); Feb_Control_module_number = (module_num & 0xFF);
Feb_Control_current_index = 1;
Feb_Control_AddModule(Feb_Control_module_number, 0);
Feb_Control_PrintModuleList(); Feb_Control_PrintModuleList();
unsigned int nfebs = 0; unsigned int nfebs = 0;
unsigned int *feb_list = malloc(moduleSize * 4 * sizeof(unsigned int)); unsigned int *feb_list = malloc(moduleSize * 4 * sizeof(unsigned int));
for (unsigned int i = 1; i < moduleSize; i++) { for (unsigned int i = 1; i < moduleSize; i++) {
if (Module_TopAddressIsValid(&modules[i])) {
feb_list[nfebs++] = Module_GetTopRightAddress(&modules[i]); feb_list[nfebs++] = Module_GetTopRightAddress(&modules[i]);
feb_list[nfebs++] = Module_GetTopLeftAddress(&modules[i]); feb_list[nfebs++] = Module_GetTopLeftAddress(&modules[i]);
} }
if (Module_BottomAddressIsValid(&modules[i])) {
feb_list[nfebs++] = Module_GetBottomRightAddress(&modules[i]);
feb_list[nfebs++] = Module_GetBottomLeftAddress(&modules[i]);
}
}
Feb_Interface_SendCompleteList(nfebs, feb_list); Feb_Interface_SendCompleteList(nfebs, feb_list);
free(feb_list); free(feb_list);

2
slsDetectorServers/eigerDetectorServer/FebControl.h
View File

@ -54,7 +54,7 @@ int Feb_Control_StartDAQOnlyNWaitForFinish(int sleep_time_us);
int Feb_Control_ResetChipCompletely(); int Feb_Control_ResetChipCompletely();
int Feb_Control_ResetChipPartially(); int Feb_Control_ResetChipPartially();
void Feb_Control_FebControl(); void Feb_Control_FebControl();
int Feb_Control_Init(int master, int top, int normal, int module_num); int Feb_Control_Init(int master, int normal, int module_num);
int Feb_Control_OpenSerialCommunication(); int Feb_Control_OpenSerialCommunication();
void Feb_Control_CloseSerialCommunication(); void Feb_Control_CloseSerialCommunication();
int Feb_Control_CheckSetup(); int Feb_Control_CheckSetup();

4
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -333,7 +333,7 @@ void initControlServer() {
Feb_Interface_FebInterface(); Feb_Interface_FebInterface();
Feb_Control_FebControl(); Feb_Control_FebControl();
// same addresses for top and bottom // same addresses for top and bottom
Feb_Control_Init(master, 1, normal, getDetectorNumber()); Feb_Control_Init(master, normal, getDetectorNumber());
// master of 9M, check high voltage serial communication to blackfin // master of 9M, check high voltage serial communication to blackfin
if (master && !normal) { if (master && !normal) {
if (Feb_Control_OpenSerialCommunication()) if (Feb_Control_OpenSerialCommunication())
@ -372,7 +372,7 @@ void initStopServer() {
Feb_Interface_FebInterface(); Feb_Interface_FebInterface();
Feb_Control_FebControl(); Feb_Control_FebControl();
// same addresses for top and bottom // same addresses for top and bottom
Feb_Control_Init(master, 1, normal, getDetectorNumber()); Feb_Control_Init(master, normal, getDetectorNumber());
LOG(logDEBUG1, ("Stop server: FEB Initialization done\n")); LOG(logDEBUG1, ("Stop server: FEB Initialization done\n"));
#endif #endif
// client first connect (from shm) will activate // client first connect (from shm) will activate