From f78a7b201bf602a798faf2232bdf4f921e29c0b2 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 18 Aug 2017 18:35:55 +0200 Subject: [PATCH] updated master file to reflect all files(not just eiger) --- slsReceiverSoftware/gitInfo.txt | 8 ++-- .../include/BinaryFileStatic.h | 48 +++++++++---------- slsReceiverSoftware/include/gitInfoReceiver.h | 10 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index ee5b9127b..8f8e51a69 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: abdbd15341f292983b3943639c54404c700fbdb8 -Revision: 622 +Repsitory UUID: 1102ff107a9d19583f85fde2b7eddbe7e9b50715 +Revision: 648 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 627 -Last Changed Date: 2017-08-09 17:19:52.000000002 +0200 ./src/Listener.cpp +Last Changed Rev: 653 +Last Changed Date: 2017-08-18 18:24:30.000000002 +0200 ./src/Listener.cpp diff --git a/slsReceiverSoftware/include/BinaryFileStatic.h b/slsReceiverSoftware/include/BinaryFileStatic.h index 1bdba1b35..022f1e829 100644 --- a/slsReceiverSoftware/include/BinaryFileStatic.h +++ b/slsReceiverSoftware/include/BinaryFileStatic.h @@ -130,32 +130,32 @@ class BinaryFileStatic { time_t t = time(0); char message[MAX_STR_LENGTH]; sprintf(message, - "Version : %.1f\n" - "Dynamic Range : %d\n" - "Ten Giga : %d\n" - "Image Size : %d bytes\n" - "x : %d pixels\n" - "y : %d pixels\n" - "Total Frames : %lld\n" - "Exptime (ns) : %lld\n" - "SubExptime (ns) : %lld\n" - "Period (ns) : %lld\n" - "Timestamp : %s\n\n" + "Version : %.1f\n" + "Dynamic Range : %d\n" + "Ten Giga : %d\n" + "Image Size : %d bytes\n" + "x : %d pixels\n" + "y : %d pixels\n" + "Total Frames : %lld\n" + "Exptime (ns) : %lld\n" + "SubExptime (ns) : %lld\n" + "Period (ns) : %lld\n" + "Timestamp : %s\n\n" "#Frame Header\n" - "Frame Number : 8 bytes\n" - "SubFrame Number : 4 bytes\n" //Only Eiger so far, else "Exposure Length" - "Packet Number : 4 bytes\n" - "Bunch ID : 8 bytes\n" - "Timestamp : 8 bytes\n" - "Module Id : 2 bytes\n" - "X Coordinate : 2 bytes\n" - "Y Coordinate : 2 bytes\n" - "Z Coordinate : 2 bytes\n" - "Debug : 4 bytes\n" - "Round Robin Number : 2 bytes\n" - "Detector Type : 1 byte\n" - "Header Version : 1 byte\n" + "Frame Number : 8 bytes\n" + "SubFrame Number/ExpLength : 4 bytes\n" + "Packet Number : 4 bytes\n" + "Bunch ID : 8 bytes\n" + "Timestamp : 8 bytes\n" + "Module Id : 2 bytes\n" + "X Coordinate : 2 bytes\n" + "Y Coordinate : 2 bytes\n" + "Z Coordinate : 2 bytes\n" + "Debug : 4 bytes\n" + "Round Robin Number : 2 bytes\n" + "Detector Type : 1 byte\n" + "Header Version : 1 byte\n" , version, dr, diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 5e00fbe9b..92733cb4a 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "https://git.psi.ch/sls_detectors_software/sls_receiver_software.git" +#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "abdbd15341f292983b3943639c54404c700fbdb8" -//#define SVNREV 0x627 +#define SVNREPUUID "1102ff107a9d19583f85fde2b7eddbe7e9b50715" +//#define SVNREV 0x653 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x627 -#define SVNDATE 0x20170809 +#define SVNREV 0x653 +#define SVNDATE 0x20170818 //