detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-09 05:50:43 +02:00
Code Issues Actions Packages Releases Activity

format files

Browse Source
This commit is contained in:
Bechir 2024-04-05 17:05:42 +02:00
parent 2f23e4610d
commit 598e9f6708
6 changed files with 76 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/zmq_receiver_example.cpp
View File

@ -12,7 +12,7 @@ int main() {
while (true) { while (true) {
int rc = socket.receive(header, reinterpret_cast<std::byte *>(data)); int rc = socket.receive(header, reinterpret_cast<std::byte *>(data));
aare::logger::info("Received bytes",rc,"Received header: ", header.to_string()); aare::logger::info("Received bytes", rc, "Received header: ", header.to_string());
auto *data_int = reinterpret_cast<uint32_t *>(data); auto *data_int = reinterpret_cast<uint32_t *>(data);
for (uint32_t i = 0; i < header.npixelsx; i++) { for (uint32_t i = 0; i < header.npixelsx; i++) {
for (uint32_t j = 0; j < header.npixelsy; j++) { for (uint32_t j = 0; j < header.npixelsy; j++) {

4
file_io/include/aare/RawFile.hpp
View File

@ -14,9 +14,7 @@ class RawFile : public FileInterface {
std::filesystem::path m_fname; // TO be made private! std::filesystem::path m_fname; // TO be made private!
// pragma to ignore warnings // pragma to ignore warnings
void write(Frame &frame) override{ void write(Frame &frame) override { throw std::runtime_error("Not implemented"); };
throw std::runtime_error("Not implemented");
};
Frame read() override { return get_frame(this->current_frame++); }; Frame read() override { return get_frame(this->current_frame++); };
std::vector<Frame> read(size_t n_frames) override; std::vector<Frame> read(size_t n_frames) override;

10
network_io/include/aare/ZmqHeader.hpp
View File

@ -46,9 +46,11 @@ template <> simdjson_inline simdjson::simdjson_result<uint32_t> simdjson::ondema
} }
/** /**
* @brief cast a simdjson::ondemand::value to a std::map<std::string, std::string> * @brief cast a simdjson::ondemand::value to a std::map<std::string, std::string>
*/ */
template <> simdjson_inline simdjson::simdjson_result<std::map<std::string, std::string>> simdjson::ondemand::value::get() noexcept { template <>
simdjson_inline simdjson::simdjson_result<std::map<std::string, std::string>>
simdjson::ondemand::value::get() noexcept {
std::map<std::string, std::string> map; std::map<std::string, std::string> map;
ondemand::object obj; ondemand::object obj;
auto error = get_object().get(obj); auto error = get_object().get(obj);
@ -131,6 +133,6 @@ struct ZmqHeader {
std::string to_string() const; std::string to_string() const;
void from_string(std::string &s); void from_string(std::string &s);
// compare operator // compare operator
bool operator==(const ZmqHeader &other) const ; bool operator==(const ZmqHeader &other) const;
}; };
} // namespace aare } // namespace aare

2
network_io/src/ZmqSocketReceiver.cpp
View File

@ -32,7 +32,7 @@ void ZmqSocketReceiver::connect() {
size_t ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serialized_header) { size_t ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serialized_header) {
size_t data_bytes_received{}; size_t data_bytes_received{};
if (serialized_header) if (serialized_header)
throw std::runtime_error("Not implemented"); throw std::runtime_error("Not implemented");

138
network_io/test/ZmqHeader.test.cpp
View File

@ -1,88 +1,80 @@
#include <catch2/catch_test_macros.hpp>
#include "aare/ZmqHeader.hpp" #include "aare/ZmqHeader.hpp"
#include "aare/utils/logger.hpp" #include "aare/utils/logger.hpp"
#include <catch2/catch_test_macros.hpp>
using namespace aare; using namespace aare;
TEST_CASE("Test ZmqHeader") { TEST_CASE("Test ZmqHeader") {
ZmqHeader header; ZmqHeader header;
header.npixelsx = 10; header.npixelsx = 10;
header.npixelsy = 15; header.npixelsy = 15;
header.data= 1; header.data = 1;
header.jsonversion= 2; header.jsonversion = 2;
header.dynamicRange= 32; header.dynamicRange = 32;
header.fileIndex= 4; header.fileIndex = 4;
header.ndetx= 5; header.ndetx = 5;
header.ndety= 6; header.ndety = 6;
header.imageSize= 4800; header.imageSize = 4800;
header.acqIndex= 8; header.acqIndex = 8;
header.frameIndex= 9; header.frameIndex = 9;
header.progress= 0.1; header.progress = 0.1;
header.fname= "test"; header.fname = "test";
header.frameNumber= 11; header.frameNumber = 11;
header.expLength= 12; header.expLength = 12;
header.packetNumber= 13; header.packetNumber = 13;
header.detSpec1= 14; header.detSpec1 = 14;
header.timestamp= 15; header.timestamp = 15;
header.modId= 16; header.modId = 16;
header.row= 17; header.row = 17;
header.column= 18; header.column = 18;
header.detSpec2= 19; header.detSpec2 = 19;
header.detSpec3= 20; header.detSpec3 = 20;
header.detSpec4= 21; header.detSpec4 = 21;
header.detType= 22; header.detType = 22;
header.version= 23; header.version = 23;
header.flipRows= 24; header.flipRows = 24;
header.quad= 25; header.quad = 25;
header.completeImage= 1; header.completeImage = 1;
header.addJsonHeader= {{"key1", "value1"}, {"key2", "value2"}}; header.addJsonHeader = {{"key1", "value1"}, {"key2", "value2"}};
header.rx_roi= {27, 28, 29, 30}; header.rx_roi = {27, 28, 29, 30};
std::string json_header = "{" std::string json_header = "{"
"\"data\": 1, " "\"data\": 1, "
"\"jsonversion\": 2, " "\"jsonversion\": 2, "
"\"dynamicRange\": 32, " "\"dynamicRange\": 32, "
"\"fileIndex\": 4, " "\"fileIndex\": 4, "
"\"ndetx\": 5, " "\"ndetx\": 5, "
"\"ndety\": 6, " "\"ndety\": 6, "
"\"npixelsx\": 10, " "\"npixelsx\": 10, "
"\"npixelsy\": 15, " "\"npixelsy\": 15, "
"\"imageSize\": 4800, " "\"imageSize\": 4800, "
"\"acqIndex\": 8, " "\"acqIndex\": 8, "
"\"frameIndex\": 9, " "\"frameIndex\": 9, "
"\"progress\": 0.100000, " "\"progress\": 0.100000, "
"\"fname\": \"test\", " "\"fname\": \"test\", "
"\"frameNumber\": 11, " "\"frameNumber\": 11, "
"\"expLength\": 12, " "\"expLength\": 12, "
"\"packetNumber\": 13, " "\"packetNumber\": 13, "
"\"detSpec1\": 14, " "\"detSpec1\": 14, "
"\"timestamp\": 15, " "\"timestamp\": 15, "
"\"modId\": 16, " "\"modId\": 16, "
"\"row\": 17, " "\"row\": 17, "
"\"column\": 18, " "\"column\": 18, "
"\"detSpec2\": 19, " "\"detSpec2\": 19, "
"\"detSpec3\": 20, " "\"detSpec3\": 20, "
"\"detSpec4\": 21, " "\"detSpec4\": 21, "
"\"detType\": 22, " "\"detType\": 22, "
"\"version\": 23, " "\"version\": 23, "
"\"flipRows\": 24, " "\"flipRows\": 24, "
"\"quad\": 25, " "\"quad\": 25, "
"\"completeImage\": 1, " "\"completeImage\": 1, "
"\"addJsonHeader\": {\"key1\": \"value1\", \"key2\": \"value2\"}, " "\"addJsonHeader\": {\"key1\": \"value1\", \"key2\": \"value2\"}, "
"\"rx_roi\": [27, 28, 29, 30]" "\"rx_roi\": [27, 28, 29, 30]"
"}"; "}";
SECTION("Test converting ZmqHeader to json string"){ SECTION("Test converting ZmqHeader to json string") { REQUIRE(header.to_string() == json_header); }
REQUIRE(header.to_string() == json_header); SECTION("Test converting json string to ZmqHeader") {
}
SECTION("Test converting json string to ZmqHeader"){
ZmqHeader header2; ZmqHeader header2;
header2.from_string(json_header); header2.from_string(json_header);
REQUIRE(header2== header); REQUIRE(header2 == header);
} }
} }

4
utils/include/aare/utils/logger.hpp
View File

@ -2,8 +2,8 @@
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <vector>
#include <map> #include <map>
#include <vector>
#define LOCATION std::string(__FILE__) + std::string(":") + std::to_string(__LINE__) + ":" + std::string(__func__) + ":" #define LOCATION std::string(__FILE__) + std::string(":") + std::to_string(__LINE__) + ":" + std::string(__func__) + ":"
@ -38,7 +38,7 @@ template <typename K, typename V> std::ostream &operator<<(std::ostream &out, co
out << "{"; out << "{";
size_t i = 0; size_t i = 0;
for (auto &kv : v) { for (auto &kv : v) {
out << kv.first << ": " << kv.second << ((++i!=v.size())?", ":""); out << kv.first << ": " << kv.second << ((++i != v.size()) ? ", " : "");
} }
out << "}"; out << "}";