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

Fix for differences in header sizes for Jungfrau data files in cluster finder depending on receiver used.

Browse Source
This commit is contained in:
paton_k 2023-03-22 14:28:41 +01:00
parent b67c6dea08
commit e817cb1222
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorCalibration/dataStructures/jungfrauModuleData.h
View File

@ -3,6 +3,7 @@
#ifndef JUNGFRAUMODULEDATA_H #ifndef JUNGFRAUMODULEDATA_H
#define JUNGFRAUMODULEDATA_H #define JUNGFRAUMODULEDATA_H
#include "slsDetectorData.h" #include "slsDetectorData.h"
#include "sls/sls_detector_defs.h"
//#define VERSION_V2 //#define VERSION_V2
/** /**
@ -41,8 +42,15 @@ class jungfrauModuleData : public slsDetectorData<uint16_t> {
1286 large etc.) \param c crosstalk parameter for the output buffer 1286 large etc.) \param c crosstalk parameter for the output buffer
*/ */
#ifdef ALDO //VH
using header = jf_header; //VH
#else //VH
using header = sls::defs::sls_receiver_header;
#endif //VH
#ifndef ZMQ #ifndef ZMQ
#define off sizeof(jf_header) #define off sizeof(header)
#endif #endif
#ifdef ZMQ #ifdef ZMQ
#define off 0 #define off 0
@ -104,7 +112,7 @@ class jungfrauModuleData : public slsDetectorData<uint16_t> {
/* }; */ /* }; */
int getFrameNumber(char *buff) { int getFrameNumber(char *buff) {
return ((jf_header *)buff)->bunchNumber; return ((header *)buff)->bunchNumber;
}; };
/** /**