From 532f76ed4f48174fedbdd662d6cd982cad629b03 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Date: Thu, 16 Mar 2023 09:23:27 +0100
Subject: [PATCH] fix hdf5 compilation using det spec fields in header (#693)

* fix hdf5 compilation using det spec fields in header
---
 RELEASE.txt                                  |  1 +
 slsReceiverSoftware/src/HDF5DataFile.cpp     | 16 ++++++++--------
 slsReceiverSoftware/src/MasterAttributes.cpp |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index 36162120c..7d5292849 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -30,6 +30,7 @@ This document describes the differences between v7.x.x and v7.0.0
 
 - moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
 - eiger febl and feb in versions
+- fix hdf5 compilation (detspec fields)
 
 
 
diff --git a/slsReceiverSoftware/src/HDF5DataFile.cpp b/slsReceiverSoftware/src/HDF5DataFile.cpp
index 54554b156..faae336b6 100644
--- a/slsReceiverSoftware/src/HDF5DataFile.cpp
+++ b/slsReceiverSoftware/src/HDF5DataFile.cpp
@@ -14,14 +14,14 @@ HDF5DataFile::HDF5DataFile(int index, std::mutex *hdf5Lib)
         "frame number",
         "exp length or sub exposure time",
         "packets caught",
-        "bunch id",
+        "detector specific 1",
         "timestamp",
         "mod id",
         "row",
         "column",
-        "reserved",
-        "debug",
-        "round robin number",
+        "detector specific 2",
+        "detector specific 3",
+        "detector specific 4",
         "detector type",
         "detector header version",
         "packets caught bit mask",
@@ -317,7 +317,7 @@ void HDF5DataFile::WriteParameterDatasets(const uint64_t currentFrameNumber,
         dataSetPara[2]->write(&header.packetNumber, parameterDataTypes[2],
                               memspace, *dataSpacePara);
         i = 3;
-        dataSetPara[3]->write(&header.bunchId, parameterDataTypes[3], memspace,
+        dataSetPara[3]->write(&header.detSpec1, parameterDataTypes[3], memspace,
                               *dataSpacePara);
         i = 4;
         dataSetPara[4]->write(&header.timestamp, parameterDataTypes[4],
@@ -332,13 +332,13 @@ void HDF5DataFile::WriteParameterDatasets(const uint64_t currentFrameNumber,
         dataSetPara[7]->write(&header.column, parameterDataTypes[7], memspace,
                               *dataSpacePara);
         i = 8;
-        dataSetPara[8]->write(&header.reserved, parameterDataTypes[8], memspace,
+        dataSetPara[8]->write(&header.detSpec2, parameterDataTypes[8], memspace,
                               *dataSpacePara);
         i = 9;
-        dataSetPara[9]->write(&header.debug, parameterDataTypes[9], memspace,
+        dataSetPara[9]->write(&header.detSpec3, parameterDataTypes[9], memspace,
                               *dataSpacePara);
         i = 10;
-        dataSetPara[10]->write(&header.roundRNumber, parameterDataTypes[10],
+        dataSetPara[10]->write(&header.detSpec4, parameterDataTypes[10],
                                memspace, *dataSpacePara);
         i = 11;
         dataSetPara[11]->write(&header.detType, parameterDataTypes[11],
diff --git a/slsReceiverSoftware/src/MasterAttributes.cpp b/slsReceiverSoftware/src/MasterAttributes.cpp
index 037353923..ea65e41e2 100644
--- a/slsReceiverSoftware/src/MasterAttributes.cpp
+++ b/slsReceiverSoftware/src/MasterAttributes.cpp
@@ -635,7 +635,7 @@ void MasterAttributes::GetMoenchBinaryAttributes(
 }
 
 #ifdef HDF5C
-void MasterAttributes::WriteMoenchuHDF5Attributes(H5::H5File *fd,
+void MasterAttributes::WriteMoenchHDF5Attributes(H5::H5File *fd,
                                                   H5::Group *group) {
     MasterAttributes::WriteHDF5Exptime(fd, group);
     MasterAttributes::WriteHDF5Period(fd, group);