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

jungfrau module id (#581)

Browse Source 
* connected module id to detid_jungfrau.txt
* fixed module id register in jungfrau
This commit is contained in:
Dhanya Thattil
2022-11-23 12:01:22 +01:00
committed by GitHub
parent 8dbcfc2ca8
commit 911b2f678f
14 changed files with 126 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,15 +93,16 @@ void setChipVersion(int version);
#ifndef EIGERD
u_int32_t getDetectorNumber();
#endif
#if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D)
#if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) || \
defined(JUNGFRAUD)
int getModuleId(int *ret, char *mess);
#endif
#if defined(EIGERD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
int updateModuleId();
#endif
#if defined(GOTTHARD2D) || defined(MYTHEN3D)
#ifndef EIGERD
void setModuleId(int modid);
#endif
#endif
u_int64_t getDetectorMAC();
u_int32_t getDetectorIP();
#ifdef GOTTHARDD

3
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -9009,7 +9009,8 @@ int get_module_id(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = -1;
#if !(defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D))
#if !(defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) || \
defined(JUNGFRAUD))
functionNotImplemented();
#else
retval = getModuleId(&ret, mess);