v1.0.0-rc49

frame_serialize/CBORStream2Deserializer.cpp

@@ -691,6 +691,7 @@ namespace {
         float increment = 1;
         Coord axis = {1,0,0};
         std::optional<Coord> helical;
+        std::optional<float> screening_wedge;
 
         CborValue map_value;
 
@@ -705,6 +706,8 @@ namespace {
                 axis = GetCoord(map_value);
             else if (key == "helical_step")
                 helical = GetCoord(map_value);
+            else if (key == "screening_wedge")
+                screening_wedge = GetCBORFloat(map_value);
             else
                 cbor_value_advance(&map_value);
         }
@@ -712,8 +715,11 @@ namespace {
 
         if (increment == 0)
             return {};
-        else
-            return GoniometerAxis(name, start, increment, axis, helical);
+        else {
+            auto g = GoniometerAxis(name, start, increment, axis, helical);
+            g.ScreeningWedge(screening_wedge);
+            return g;
+        }
     }
 
     void ProcessROIConfig(StartMessage &message, const nlohmann::json &j) {
@@ -853,6 +859,10 @@ namespace {
                 message.overwrite = j["xfel_pulse_id"];
             if (j.contains("file_format"))
                 message.file_format = ProcessHDF5Format(j["file_format"]);
+            if (j.contains("ring_current_mA"))
+                message.ring_current_mA = j["ring_current_mA"];
+            if (j.contains("sample_temperature_K"))
+                message.sample_temperature_K = j["sample_temperature_K"];
         } catch (const std::exception &e) {
             throw JFJochException(JFJochExceptionCategory::CBORError,
                                   "Cannot parse user_data as valid JSON " + std::string(e.what()));