From 11c1fb0e1195b8d59984ec5263bee8f88423ec05 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 20 Aug 2019 13:42:26 +0200
Subject: [PATCH] Added roi to master file

---
 slsReceiverSoftware/include/BinaryFileStatic.h        | 3 +++
 slsReceiverSoftware/include/HDF5FileStatic.h          | 8 ++++++++
 slsReceiverSoftware/include/receiver_defs.h           | 2 ++
 slsReceiverSoftware/src/slsReceiverImplementation.cpp | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/slsReceiverSoftware/include/BinaryFileStatic.h b/slsReceiverSoftware/include/BinaryFileStatic.h
index 132eb203d..49f42eae1 100755
--- a/slsReceiverSoftware/include/BinaryFileStatic.h
+++ b/slsReceiverSoftware/include/BinaryFileStatic.h
@@ -140,6 +140,7 @@ class BinaryFileStatic {
 				"ADC Mask                   : %d\n"
 				"Dbit Offset                : %d\n"
 				"Dbit Bitset                : %lld\n"
+				"Roi (xmin, xmax)           : %d %d\n"
 				"Timestamp                  : %s\n\n"
 
 				"#Frame Header\n"
@@ -179,6 +180,8 @@ class BinaryFileStatic {
     			attr.adcmask,
     			attr.dbitoffset,
     			(long long int)attr.dbitlist,
+				attr.roiXmin,
+				attr.roiXmax,
 				ctime(&t));
 		if (strlen(message) > MAX_MASTER_FILE_LENGTH) {
 			FILE_LOG(logERROR) << "Master File Size " << strlen(message) <<
diff --git a/slsReceiverSoftware/include/HDF5FileStatic.h b/slsReceiverSoftware/include/HDF5FileStatic.h
index d7f0ca915..7008478d5 100755
--- a/slsReceiverSoftware/include/HDF5FileStatic.h
+++ b/slsReceiverSoftware/include/HDF5FileStatic.h
@@ -431,6 +431,14 @@ public:
 			dataset = group5.createDataSet ( "dbit bitset list", PredType::STD_U64LE, dataspace );
 			dataset.write ( &(attr.periodNs), PredType::STD_U64LE);
 
+			// Roi xmin
+			dataset = group5.createDataSet ( "roi xmin", PredType::NATIVE_INT, dataspace );
+			dataset.write ( &(attr.roiXmin), PredType::NATIVE_INT);
+
+			// Roi xmax
+			dataset = group5.createDataSet ( "roi xmax", PredType::NATIVE_INT, dataspace );
+			dataset.write ( &(attr.roiXmax), PredType::NATIVE_INT);
+
 			//Timestamp
 			time_t t = time(0);
 			dataset = group5.createDataSet ( "timestamp", strdatatype, dataspace );
diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h
index 2122ac88e..e4f6b30e4 100755
--- a/slsReceiverSoftware/include/receiver_defs.h
+++ b/slsReceiverSoftware/include/receiver_defs.h
@@ -71,4 +71,6 @@ struct masterAttributes {
     uint32_t adcmask;
     uint32_t dbitoffset;
     uint64_t dbitlist;
+    uint32_t roiXmin;
+    uint32_t roiXmax;
  };
\ No newline at end of file
diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
index 4791a66d7..4bf587362 100755
--- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp
+++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
@@ -1659,6 +1659,8 @@ int slsReceiverImplementation::SetupWriter() {
     attr.adcmask = adcEnableMask;
     attr.dbitoffset = ctbDbitOffset;
     attr.dbitlist = 0;
+    attr.roiXmin = roi.xmin;
+    attr.roiXmax = roi.xmax;
     for (auto &i : ctbDbitList) {
         attr.dbitlist |= (1 << i);
     }