detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-06-05 11:27:19 +02:00
parent ff3e5001e6
commit 862dc824ba
13 changed files with 240 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1266,9 +1266,6 @@ int Feb_Control_SetReadoutSpeed(unsigned int readout_speed) { //0->full,1->half,
} else if (readout_speed==2) {
Feb_Control_acquireNReadoutMode |= DAQ_CHIP_CONTROLLER_QUARTER_SPEED;
FILE_LOG(logINFO, ("Speed set to quarter speed (25 MHz)\n"));
} else if (readout_speed==3) {
Feb_Control_acquireNReadoutMode |= DAQ_CHIP_CONTROLLER_SUPER_SLOW_SPEED;
FILE_LOG(logINFO, ("Speed set to super slow speed (~0.200 MHz)\n"));
} else {
if (readout_speed) {
FILE_LOG(logERROR, ("readout speed %d unknown, defaulting to full speed.\n",readout_speed));

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui Executable file
View File

Binary file not shown.

8
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -553,11 +553,6 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val) {
val=E_NON_PARALLEL;
FILE_LOG(logDEBUG1, ("Setting Read out Flag: Non Parallel\n"));
break;
case SAFE:
val=E_SAFE;
FILE_LOG(logDEBUG1, ("Setting Read out Flag: Safe\n"));
break;
default:
FILE_LOG(logERROR, ("Cannot set unknown readout flag. 0x%x\n", val));
return -1;
@ -623,9 +618,6 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val) {
case E_NON_PARALLEL:
retval=NONPARALLEL;
break;
case E_SAFE:
retval=SAFE;
break;
}
switch(eiger_overflow32) {