detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 00:03:42 +01:00
Code Issues Actions Packages Releases Activity

fixed gui for new header

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-20 09:28:15 +01:00
parent 1413244617
commit 575c9617c7
4 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "5edf56eead747efd9f52c5b29d3e23a235a74479"
//#define SVNREV 0x503
#define SVNREPUUID "37c93c568669422f853cc8eb3f22d3b4afc257ba"
//#define SVNREV 0x504
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x503
#define SVNREV 0x504
#define SVNDATE 0x20170315
//

3
slsReceiverSoftware/include/receiver_defs.h
View File

@@ -58,7 +58,8 @@ typedef struct {
#define HEADER_SIZE_NUM_PACKETS 1
#define ALL_MASK_32 0xFFFFFFFF
#define SLS_DETECTOR_HEADER_VERSION 0x1
#define SLS_DETECTOR_HEADER_VERSION 0x1
#define SLS_DETECTOR_JSON_HEADER_VERSION 0x2
//#define FILE_FRAME_HEADER_LENGTH (8*3)
//#define FILE_HEADER_TIMESTAMP_OFFSET 8 //start of frame/ bunch id
//#define FILE_HEADER_EXPLENGTH_OFFSET 16 //exposure length/ sub frame number