From 0842971183bbd8712176b3710c9092f61ab9f431 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Mon, 1 Dec 2025 13:19:58 +0100
Subject: [PATCH] jfjoch_broker: Don't broadcast primitive lattice through CBOR

---
 common/JFJochMessages.h                     | 2 +-
 frame_serialize/CBORStream2Deserializer.cpp | 4 ----
 frame_serialize/CBORStream2Serializer.cpp   | 1 -
 reader/JFJochHDF5Reader.cpp                 | 1 -
 tests/JFJochReaderTest.cpp                  | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/common/JFJochMessages.h b/common/JFJochMessages.h
index 58403e6f..c762ad08 100644
--- a/common/JFJochMessages.h
+++ b/common/JFJochMessages.h
@@ -78,7 +78,6 @@ struct LatticeMessage {
     char centering;
     int64_t niggli_class;
     gemmi::CrystalSystem crystal_system;
-    CrystalLattice primitive;
 };
 
 struct DataMessage {
@@ -292,6 +291,7 @@ struct EndMessage {
     std::map<std::string, std::vector<float>> az_int_result;
     std::map<std::string, std::vector<uint64_t>> adu_histogram;
     uint64_t adu_histogram_bin_width;
+
 };
 
 struct MetadataMessage {
diff --git a/frame_serialize/CBORStream2Deserializer.cpp b/frame_serialize/CBORStream2Deserializer.cpp
index d64c5a26..d5251146 100644
--- a/frame_serialize/CBORStream2Deserializer.cpp
+++ b/frame_serialize/CBORStream2Deserializer.cpp
@@ -523,10 +523,6 @@ namespace {
                 else {
                     // unknown string, keep default
                 }
-            } else if (key == "primitive_lattice") {
-                std::vector<float> tmp;
-                GetCBORFloatArray(map_value, tmp);
-                lm.primitive = CrystalLattice(tmp);
             } else {
                 cbor_value_advance(&map_value);
             }
diff --git a/frame_serialize/CBORStream2Serializer.cpp b/frame_serialize/CBORStream2Serializer.cpp
index 5b335be1..0fe30f7c 100644
--- a/frame_serialize/CBORStream2Serializer.cpp
+++ b/frame_serialize/CBORStream2Serializer.cpp
@@ -431,7 +431,6 @@ inline void CBOR_ENC(CborEncoder &encoder, const char* key, const LatticeMessage
         case gemmi::CrystalSystem::Cubic:       cs_name = "cubic";       break;
     }
     CBOR_ENC(mapEncoder, "system", std::string(cs_name));
-    CBOR_ENC(mapEncoder, "primitive_lattice", val.primitive.GetVector());
     cborErr(cbor_encoder_close_container(&encoder, &mapEncoder));
 }
 
diff --git a/reader/JFJochHDF5Reader.cpp b/reader/JFJochHDF5Reader.cpp
index be9f2c0f..f3c39509 100644
--- a/reader/JFJochHDF5Reader.cpp
+++ b/reader/JFJochHDF5Reader.cpp
@@ -613,7 +613,6 @@ bool JFJochHDF5Reader::LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset
                 .centering = symm_info.second,
                 .niggli_class = static_cast<int64_t>(niggli_opt.value()),
                 .crystal_system = symm_info.first,
-                .primitive = message.indexing_lattice.value()
             };
         }
     }
diff --git a/tests/JFJochReaderTest.cpp b/tests/JFJochReaderTest.cpp
index 052c0a3e..11e3b124 100644
--- a/tests/JFJochReaderTest.cpp
+++ b/tests/JFJochReaderTest.cpp
@@ -1004,7 +1004,6 @@ TEST_CASE("JFJochReader_NiggliClass", "[HDF5][Full]") {
             .centering = 'F',
             .niggli_class = 1,
             .crystal_system = gemmi::CrystalSystem::Cubic,
-            .primitive = CrystalLattice(40, 50, 60, 90, 90, 90)
         };
 
         DataMessage message{};