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

wip, prettywriter

Browse Source
This commit is contained in:
maliakal_d 2022-03-30 10:43:43 +02:00
parent 74e325edb4
commit c57e528447
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsReceiverSoftware/src/MasterAttributes.cpp
View File

@ -3,7 +3,7 @@
#include "MasterAttributes.h" #include "MasterAttributes.h"
void MasterAttributes::GetBinaryAttributes( void MasterAttributes::GetBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->StartObject(); w->StartObject();
GetCommonBinaryAttributes(w); GetCommonBinaryAttributes(w);
switch (detType) { switch (detType) {
@ -70,7 +70,7 @@ void MasterAttributes::WriteHDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetCommonBinaryAttributes( void MasterAttributes::GetCommonBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Version"); w->Key("Version");
w->SetMaxDecimalPlaces(2); w->SetMaxDecimalPlaces(2);
w->Double(BINARY_WRITER_VERSION); w->Double(BINARY_WRITER_VERSION);
@ -112,7 +112,7 @@ void MasterAttributes::GetCommonBinaryAttributes(
} }
void MasterAttributes::GetFinalBinaryAttributes( void MasterAttributes::GetFinalBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
// adding few common parameters to the end // adding few common parameters to the end
if (!additionalJsonHeader.empty()) { if (!additionalJsonHeader.empty()) {
w->Key("Additional Json Header"); w->Key("Additional Json Header");
@ -533,7 +533,7 @@ void MasterAttributes::WriteHDF5DbitList(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetGotthardBinaryAttributes( void MasterAttributes::GetGotthardBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Exptime"); w->Key("Exptime");
w->String(sls::ToString(exptime).c_str()); w->String(sls::ToString(exptime).c_str());
w->Key("Period"); w->Key("Period");
@ -551,7 +551,7 @@ void MasterAttributes::WriteGotthardHDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetJungfrauBinaryAttributes( void MasterAttributes::GetJungfrauBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Exptime"); w->Key("Exptime");
w->String(sls::ToString(exptime).c_str()); w->String(sls::ToString(exptime).c_str());
w->Key("Period"); w->Key("Period");
@ -572,7 +572,7 @@ void MasterAttributes::WriteJungfrauHDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetEigerBinaryAttributes( void MasterAttributes::GetEigerBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Dynamic Range"); w->Key("Dynamic Range");
w->Uint(dynamicRange); w->Uint(dynamicRange);
w->Key("Ten Giga"); w->Key("Ten Giga");
@ -611,7 +611,7 @@ void MasterAttributes::WriteEigerHDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetMythen3BinaryAttributes( void MasterAttributes::GetMythen3BinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Dynamic Range"); w->Key("Dynamic Range");
w->Uint(dynamicRange); w->Uint(dynamicRange);
w->Key("Ten Giga"); w->Key("Ten Giga");
@ -648,7 +648,7 @@ void MasterAttributes::WriteMythen3HDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetGotthard2BinaryAttributes( void MasterAttributes::GetGotthard2BinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Exptime"); w->Key("Exptime");
w->String(sls::ToString(exptime).c_str()); w->String(sls::ToString(exptime).c_str());
w->Key("Period"); w->Key("Period");
@ -666,7 +666,7 @@ void MasterAttributes::WriteGotthard2HDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetMoenchBinaryAttributes( void MasterAttributes::GetMoenchBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Exptime"); w->Key("Exptime");
w->String(sls::ToString(exptime).c_str()); w->String(sls::ToString(exptime).c_str());
w->Key("Period"); w->Key("Period");
@ -690,7 +690,7 @@ void MasterAttributes::WriteMoenchHDF5Attributes(H5File *fd, Group *group) {
#endif #endif
void MasterAttributes::GetCtbBinaryAttributes( void MasterAttributes::GetCtbBinaryAttributes(
rapidjson::Writer<rapidjson::StringBuffer> *w) { rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
w->Key("Exptime"); w->Key("Exptime");
w->String(sls::ToString(exptime).c_str()); w->String(sls::ToString(exptime).c_str());
w->Key("Period"); w->Key("Period");

22
slsReceiverSoftware/src/MasterAttributes.h
View File

@ -8,7 +8,7 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#include <rapidjson/stringbuffer.h> #include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h> #include <rapidjson/prettywriter.h>
#ifdef HDF5C #ifdef HDF5C
#include "H5Cpp.h" #include "H5Cpp.h"
@ -65,15 +65,15 @@ class MasterAttributes {
MasterAttributes() = default; MasterAttributes() = default;
~MasterAttributes() = default; ~MasterAttributes() = default;
void GetBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); void GetBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteHDF5Attributes(H5File *fd, Group *group); void WriteHDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetCommonBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetCommonBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
void void
GetFinalBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetFinalBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteCommonHDF5Attributes(H5File *fd, Group *group); void WriteCommonHDF5Attributes(H5File *fd, Group *group);
void WriteFinalHDF5Attributes(H5File *fd, Group *group); void WriteFinalHDF5Attributes(H5File *fd, Group *group);
@ -105,42 +105,42 @@ class MasterAttributes {
#endif #endif
void void
GetGotthardBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetGotthardBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteGotthardHDF5Attributes(H5File *fd, Group *group); void WriteGotthardHDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetJungfrauBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetJungfrauBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteJungfrauHDF5Attributes(H5File *fd, Group *group); void WriteJungfrauHDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetEigerBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetEigerBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteEigerHDF5Attributes(H5File *fd, Group *group); void WriteEigerHDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetMythen3BinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetMythen3BinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteMythen3HDF5Attributes(H5File *fd, Group *group); void WriteMythen3HDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetGotthard2BinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetGotthard2BinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteGotthard2HDF5Attributes(H5File *fd, Group *group); void WriteGotthard2HDF5Attributes(H5File *fd, Group *group);
#endif #endif
void void
GetMoenchBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); GetMoenchBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteMoenchHDF5Attributes(H5File *fd, Group *group); void WriteMoenchHDF5Attributes(H5File *fd, Group *group);
#endif #endif
void GetCtbBinaryAttributes(rapidjson::Writer<rapidjson::StringBuffer> *w); void GetCtbBinaryAttributes(rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
#ifdef HDF5C #ifdef HDF5C
void WriteCtbHDF5Attributes(H5File *fd, Group *group); void WriteCtbHDF5Attributes(H5File *fd, Group *group);
#endif #endif

2
slsReceiverSoftware/src/MasterFileUtility.cpp
View File

@ -34,7 +34,7 @@ std::string CreateMasterBinaryFile(const std::string filePath,
} }
rapidjson::StringBuffer s; rapidjson::StringBuffer s;
rapidjson::Writer<rapidjson::StringBuffer> writer(s); rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(s);
attr->GetBinaryAttributes(&writer); attr->GetBinaryAttributes(&writer);
std::string message = s.GetString(); std::string message = s.GetString();
if (fwrite((void *)message.c_str(), 1, message.length(), fd) != if (fwrite((void *)message.c_str(), 1, message.length(), fd) !=