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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-15 16:41:40 +02:00
parent 8c9341836b
commit bcb5b8047b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -20,7 +20,7 @@ char Module_dac_names[16][10] = {"VSvP", "Vtrim", "Vrpreamp", "Vrshaper",
"Vcal", "Vcmp_rl", "rxb_rb", "rxb_lb", "Vcal", "Vcmp_rl", "rxb_rb", "rxb_lb",
"Vcmp_rr", "Vcp", "Vcn", "Vishaper"}; "Vcmp_rr", "Vcp", "Vcn", "Vishaper"};
struct Module modules[10]; struct Module modules[2];
int moduleSize = 0; int moduleSize = 0;
unsigned int unsigned int
@ -833,13 +833,11 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) {
if (Feb_Control_activated) { if (Feb_Control_activated) {
if (!Feb_Interface_WriteMemoryInLoops( if (!Feb_Interface_WriteMemoryInLoops(
Module_GetLeftAddress( Module_GetLeftAddress(&modules[1]), 0, 0, 1024,
&modules[Feb_Control_current_index]), trimbits_to_load_l) ||
0, 0, 1024, trimbits_to_load_l) ||
!Feb_Interface_WriteMemoryInLoops( !Feb_Interface_WriteMemoryInLoops(
Module_GetRightAddress( Module_GetRightAddress(&modules[1]), 0, 0, 1024,
&modules[Feb_Control_current_index]), trimbits_to_load_r) ||
0, 0, 1024, trimbits_to_load_r) ||
(Feb_Control_StartDAQOnlyNWaitForFinish(5000) != (Feb_Control_StartDAQOnlyNWaitForFinish(5000) !=
STATUS_IDLE)) { STATUS_IDLE)) {
LOG(logERROR, (" some errror in setting trimbits!\n")); LOG(logERROR, (" some errror in setting trimbits!\n"));

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1495,7 +1495,7 @@ int setQuad(int value) {
return OK; return OK;
} }
// only top can be set to quad // only top can be set to quad
if (!top & value > 0) { if (!top && value > 0) {
LOG(logERROR, ("Only a top can be set to quad\n")); LOG(logERROR, ("Only a top can be set to quad\n"));
return FAIL; return FAIL;
} }