mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 19:30:03 +02:00
Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed
This commit is contained in:
commit
b1ae47d189
Binary file not shown.
@ -9247,7 +9247,7 @@ int get_readout_speed(int file_des) {
|
|||||||
int retval = -1;
|
int retval = -1;
|
||||||
LOG(logDEBUG1, ("Getting readout speed\n"));
|
LOG(logDEBUG1, ("Getting readout speed\n"));
|
||||||
|
|
||||||
#if !defined(JUNGFRAU) && !defined(EIGER) && !defined(GOTTHARD2D)
|
#if !defined(JUNGFRAUD) && !defined(EIGER) && !defined(GOTTHARD2D)
|
||||||
functionNotImplemented();
|
functionNotImplemented();
|
||||||
#else
|
#else
|
||||||
// get only
|
// get only
|
||||||
@ -9270,7 +9270,7 @@ int set_readout_speed(int file_des) {
|
|||||||
return printSocketReadError();
|
return printSocketReadError();
|
||||||
LOG(logDEBUG1, ("Setting readout speed : %u\n", arg));
|
LOG(logDEBUG1, ("Setting readout speed : %u\n", arg));
|
||||||
|
|
||||||
#if !defined(JUNGFRAU) && !defined(EIGER) && !defined(GOTTHARD2D)
|
#if !defined(JUNGFRAUD) && !defined(EIGER) && !defined(GOTTHARD2D)
|
||||||
functionNotImplemented();
|
functionNotImplemented();
|
||||||
#else
|
#else
|
||||||
// only set
|
// only set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user