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

Jungfraumaster (#518)

Browse Source 
* set jungfrau master only from client
* added tests, fixed a bug in ctb and moench (infinite recursion) that will never happen atm
This commit is contained in:
Dhanya Thattil
2022-08-16 09:51:18 +02:00
committed by GitHub
parent 01696ca89b
commit 809b0bdeb8
14 changed files with 111 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -385,7 +385,7 @@ int getADC(enum ADCINDEX ind);
int setHighVoltage(int val);
// parameters - timing, extsig
#if defined(EIGERD) || defined(GOTTHARD2D)
#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD)
int setMaster(enum MASTERINDEX m);
#endif
#ifdef EIGERD
@ -393,7 +393,7 @@ int setTop(enum TOPINDEX t);
int isTop(int *retval);
#endif
#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) || \
defined(GOTTHARD2D)
defined(GOTTHARD2D) || defined(JUNGFRAUD)
int isMaster(int *retval);
#endif