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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-12 17:07:58 +02:00
parent 5a7eeb3d76
commit 7c2949f372
2 changed files with 36 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -75,80 +75,45 @@ void Module_Module(struct Module *mod, unsigned int number,
unsigned int Module_GetModuleNumber(struct Module *mod) { unsigned int Module_GetModuleNumber(struct Module *mod) {
return mod->module_number; return mod->module_number;
} }
int Module_TopAddressIsValid(struct Module *mod) {
return mod->top_address_valid; unsigned int Module_GetBaseAddress(struct Module *mod) {
} return (mod->left_address & 0xff);
unsigned int Module_GetTopBaseAddress(struct Module *mod) {
return (mod->top_left_address & 0xff);
}
unsigned int Module_GetTopLeftAddress(struct Module *mod) {
return mod->top_left_address;
}
unsigned int Module_GetTopRightAddress(struct Module *mod) {
return mod->top_right_address;
}
unsigned int Module_GetBottomBaseAddress(struct Module *mod) {
return (mod->bottom_left_address & 0xff);
}
int Module_BottomAddressIsValid(struct Module *mod) {
return mod->bottom_address_valid;
}
unsigned int Module_GetBottomLeftAddress(struct Module *mod) {
return mod->bottom_left_address;
}
unsigned int Module_GetBottomRightAddress(struct Module *mod) {
return mod->bottom_right_address;
} }
unsigned int Module_SetTopIDelay(struct Module *mod, unsigned int chip, unsigned int Module_GetLeftAddress(struct Module *mod) {
return mod->left_address;
}
unsigned int Module_GetRightAddress(struct Module *mod) {
return mod->right_address;
}
unsigned int Module_SetIDelay(struct Module *mod, unsigned int chip,
unsigned int value) { unsigned int value) {
return Module_TopAddressIsValid(mod) && chip < 4 // chip 0=ll,1=lr,0=rl,1=rr
? (mod->idelay_top[chip] = value) return chip < 4 ? (mod->idelay[chip] = value) : 0;
: 0; }
} // chip 0=ll,1=lr,0=rl,1=rr
unsigned int Module_GetTopIDelay(struct Module *mod, unsigned int chip) { unsigned int Module_GetIDelay(struct Module *mod, unsigned int chip) {
return chip < 4 ? mod->idelay_top[chip] : 0; return chip < 4 ? mod->idelay[chip] : 0;
} // chip 0=ll,1=lr,0=rl,1=rr }
unsigned int Module_SetBottomIDelay(struct Module *mod, unsigned int chip,
unsigned int value) {
return Module_BottomAddressIsValid(mod) && chip < 4
? (mod->idelay_bottom[chip] = value)
: 0;
} // chip 0=ll,1=lr,0=rl,1=rr
unsigned int Module_GetBottomIDelay(struct Module *mod, unsigned int chip) {
return chip < 4 ? mod->idelay_bottom[chip] : 0;
} // chip 0=ll,1=lr,0=rl,1=rr
float Module_SetHighVoltage(struct Module *mod, float value) { float Module_SetHighVoltage(struct Module *mod, float value) {
return Feb_control_master ? (mod->high_voltage = value) : -1; return Feb_control_master ? (mod->high_voltage = value) : -1;
} // Module_TopAddressIsValid(mod) ? (mod->high_voltage=value) : -1;} }
float Module_GetHighVoltage(struct Module *mod) { return mod->high_voltage; } float Module_GetHighVoltage(struct Module *mod) { return mod->high_voltage; }
int Module_SetTopDACValue(struct Module *mod, unsigned int i, int value) { int Module_SetDACValue(struct Module *mod, unsigned int i, int value) {
return (i < Module_ndacs && Module_TopAddressIsValid(mod)) return (i < Module_ndacs) ? (mod->dac[i] = value) : -1;
? (mod->top_dac[i] = value)
: -1;
} }
int Module_GetTopDACValue(struct Module *mod, unsigned int i) {
return (i < Module_ndacs) ? mod->top_dac[i] : -1; int Module_GetDACValue(struct Module *mod, unsigned int i) {
} return (i < Module_ndacs) ? mod->dac[i] : -1;
int Module_SetBottomDACValue(struct Module *mod, unsigned int i, int value) {
return (i < Module_ndacs && Module_BottomAddressIsValid(mod))
? (mod->bottom_dac[i] = value)
: -1;
}
int Module_GetBottomDACValue(struct Module *mod, unsigned int i) {
return (i < Module_ndacs) ? mod->bottom_dac[i] : -1;
} }
void Feb_Control_activate(int activate) { Feb_Control_activated = activate; } void Feb_Control_activate(int activate) { Feb_Control_activated = activate; }
int Feb_Control_IsBottomModule() {
if (Module_BottomAddressIsValid(&modules[Feb_Control_current_index]))
return 1;
return 0;
}
int Feb_Control_GetModuleNumber() { return Feb_Control_module_number; } int Feb_Control_GetModuleNumber() { return Feb_Control_module_number; }
void Feb_Control_FebControl() { void Feb_Control_FebControl() {
@ -336,20 +301,6 @@ int Feb_Control_CheckModuleAddresses(struct Module *m) {
int Feb_Control_AddModule(unsigned int module_number, int Feb_Control_AddModule(unsigned int module_number,
unsigned int top_address) { unsigned int top_address) {
int parameters_ok = 1; int parameters_ok = 1;
<<<<<<< Updated upstream
unsigned int pre_module_index = 0;
if (Feb_Control_GetModuleIndex(module_number, &pre_module_index)) {
LOG(logINFO, ("\tRemoving previous assignment of module number %d.\n",
module_number));
// free(modules[pre_module_index]);
for (int i = pre_module_index; i < moduleSize - 1; i++)
modules[i] = modules[i + 1];
moduleSize--;
parameters_ok = 0;
}
=======
>>>>>>> Stashed changes
struct Module mod, *m; struct Module mod, *m;
m = &mod; m = &mod;
Module_Module(m, module_number, top_address); Module_Module(m, module_number, top_address);

31
slsDetectorServers/eigerDetectorServer/FebControl.h
View File

@ -7,7 +7,7 @@ struct Module {
unsigned int module_number; unsigned int module_number;
unsigned int left_address; unsigned int left_address;
unsigned int right_address; unsigned int right_address;
unsigned int idelay_top[4]; // ll,lr,rl,ll unsigned int idelay[4]; // ll,lr,rl,ll
float high_voltage; float high_voltage;
int *dac; int *dac;
}; };
@ -15,34 +15,19 @@ struct Module {
void Module_Module(struct Module *mod, unsigned int number, void Module_Module(struct Module *mod, unsigned int number,
unsigned int address_top); unsigned int address_top);
unsigned int Module_GetModuleNumber(struct Module *mod); unsigned int Module_GetModuleNumber(struct Module *mod);
int Module_TopAddressIsValid(struct Module *mod); unsigned int Module_GetBaseAddress(struct Module *mod);
unsigned int Module_GetTopBaseAddress(struct Module *mod); unsigned int Module_GetLeftAddress(struct Module *mod);
unsigned int Module_GetTopLeftAddress(struct Module *mod); unsigned int Module_GetRightAddress(struct Module *mod);
unsigned int Module_GetTopRightAddress(struct Module *mod); unsigned int Module_SetIDelay(struct Module *mod, unsigned int chip,
unsigned int Module_GetBottomBaseAddress(struct Module *mod);
int Module_BottomAddressIsValid(struct Module *mod);
unsigned int Module_GetBottomLeftAddress(struct Module *mod);
unsigned int Module_GetBottomRightAddress(struct Module *mod);
unsigned int Module_SetTopIDelay(struct Module *mod, unsigned int chip,
unsigned int value); unsigned int value);
unsigned int Module_GetTopIDelay(struct Module *mod, unsigned int chip); unsigned int Module_GetIDelay(struct Module *mod, unsigned int chip);
unsigned int Module_SetBottomIDelay(struct Module *mod, unsigned int chip,
unsigned int value);
unsigned int Module_GetBottomIDelay(struct Module *mod, unsigned int chip);
float Module_SetHighVoltage(struct Module *mod, float value); float Module_SetHighVoltage(struct Module *mod, float value);
float Module_GetHighVoltage(struct Module *mod); float Module_GetHighVoltage(struct Module *mod);
int Module_SetDACValue(struct Module *mod, unsigned int i, int value);
int Module_SetTopDACValue(struct Module *mod, unsigned int i, int value); int Module_GetDACValue(struct Module *mod, unsigned int i);
int Module_GetTopDACValue(struct Module *mod, unsigned int i);
int Module_SetBottomDACValue(struct Module *mod, unsigned int i, int value);
int Module_GetBottomDACValue(struct Module *mod, unsigned int i);
void Feb_Control_activate(int activate); void Feb_Control_activate(int activate);
int Feb_Control_IsBottomModule();
int Feb_Control_GetModuleNumber(); int Feb_Control_GetModuleNumber();
void Feb_Control_PrintModuleList(); void Feb_Control_PrintModuleList();
int Feb_Control_GetModuleIndex(unsigned int module_number, int Feb_Control_GetModuleIndex(unsigned int module_number,
unsigned int *module_index); unsigned int *module_index);