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

updated master file to reflect all files(not just eiger)

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-18 18:35:55 +02:00
parent cc5862533e
commit f78a7b201b
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: abdbd15341f292983b3943639c54404c700fbdb8 Repsitory UUID: 1102ff107a9d19583f85fde2b7eddbe7e9b50715
Revision: 622 Revision: 648
Branch: 3.0-rc Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 627 Last Changed Rev: 653
Last Changed Date: 2017-08-09 17:19:52.000000002 +0200 ./src/Listener.cpp Last Changed Date: 2017-08-18 18:24:30.000000002 +0200 ./src/Listener.cpp

48
slsReceiverSoftware/include/BinaryFileStatic.h
View File

@ -130,32 +130,32 @@ class BinaryFileStatic {
time_t t = time(0); time_t t = time(0);
char message[MAX_STR_LENGTH]; char message[MAX_STR_LENGTH];
sprintf(message, sprintf(message,
"Version : %.1f\n" "Version : %.1f\n"
"Dynamic Range : %d\n" "Dynamic Range : %d\n"
"Ten Giga : %d\n" "Ten Giga : %d\n"
"Image Size : %d bytes\n" "Image Size : %d bytes\n"
"x : %d pixels\n" "x : %d pixels\n"
"y : %d pixels\n" "y : %d pixels\n"
"Total Frames : %lld\n" "Total Frames : %lld\n"
"Exptime (ns) : %lld\n" "Exptime (ns) : %lld\n"
"SubExptime (ns) : %lld\n" "SubExptime (ns) : %lld\n"
"Period (ns) : %lld\n" "Period (ns) : %lld\n"
"Timestamp : %s\n\n" "Timestamp : %s\n\n"
"#Frame Header\n" "#Frame Header\n"
"Frame Number : 8 bytes\n" "Frame Number : 8 bytes\n"
"SubFrame Number : 4 bytes\n" //Only Eiger so far, else "Exposure Length" "SubFrame Number/ExpLength : 4 bytes\n"
"Packet Number : 4 bytes\n" "Packet Number : 4 bytes\n"
"Bunch ID : 8 bytes\n" "Bunch ID : 8 bytes\n"
"Timestamp : 8 bytes\n" "Timestamp : 8 bytes\n"
"Module Id : 2 bytes\n" "Module Id : 2 bytes\n"
"X Coordinate : 2 bytes\n" "X Coordinate : 2 bytes\n"
"Y Coordinate : 2 bytes\n" "Y Coordinate : 2 bytes\n"
"Z Coordinate : 2 bytes\n" "Z Coordinate : 2 bytes\n"
"Debug : 4 bytes\n" "Debug : 4 bytes\n"
"Round Robin Number : 2 bytes\n" "Round Robin Number : 2 bytes\n"
"Detector Type : 1 byte\n" "Detector Type : 1 byte\n"
"Header Version : 1 byte\n" "Header Version : 1 byte\n"
, ,
version, version,
dr, dr,

10
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#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 SVNREPPATH ""
#define SVNREPUUID "abdbd15341f292983b3943639c54404c700fbdb8" #define SVNREPUUID "1102ff107a9d19583f85fde2b7eddbe7e9b50715"
//#define SVNREV 0x627 //#define SVNREV 0x653
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x627 #define SVNREV 0x653
#define SVNDATE 0x20170809 #define SVNDATE 0x20170818
// //