v1.0.0-rc.70
This commit is contained in:
@@ -442,6 +442,13 @@ inline void CBOR_ENC_START_USER_DATA(CborEncoder& encoder, const char* key,
|
||||
if (message.file_format.has_value())
|
||||
j["file_format"] = static_cast<int>(message.file_format.value());
|
||||
|
||||
if (message.poni_rot1.has_value())
|
||||
j["poni_rot1"] = message.poni_rot1.value();
|
||||
if (message.poni_rot2.has_value())
|
||||
j["poni_rot2"] = message.poni_rot2.value();
|
||||
if (message.poni_rot3.has_value())
|
||||
j["poni_rot3"] = message.poni_rot3.value();
|
||||
|
||||
switch(message.indexing_algorithm) {
|
||||
case IndexingAlgorithmEnum::FFBIDX:
|
||||
j["indexing_algorithm"] = "ffbidx";
|
||||
@@ -454,6 +461,18 @@ inline void CBOR_ENC_START_USER_DATA(CborEncoder& encoder, const char* key,
|
||||
break;
|
||||
}
|
||||
|
||||
switch (message.geom_refinement_algorithm) {
|
||||
case GeomRefinementAlgorithmEnum::BeamCenter:
|
||||
j["geom_refinement_algorithm"] = "beam_center";
|
||||
break;
|
||||
case GeomRefinementAlgorithmEnum::BeamCenterTetragonal:
|
||||
j["geom_refinement_algorithm"] = "beam_center_tetragonal";
|
||||
break;
|
||||
default:
|
||||
j["geom_refinement_algorithm"] = "none";
|
||||
break;
|
||||
}
|
||||
|
||||
auto str = j.dump();
|
||||
|
||||
CBOR_ENC(encoder, key, str);
|
||||
@@ -622,6 +641,8 @@ void CBORStream2Serializer::SerializeImageInternal(CborEncoder &mapEncoder, cons
|
||||
CBOR_ENC(mapEncoder, "bkg_estimate", message.bkg_estimate);
|
||||
CBOR_ENC(mapEncoder, "adu_histogram", message.adu_histogram);
|
||||
CBOR_ENC(mapEncoder, "roi_integrals", message.roi);
|
||||
CBOR_ENC(mapEncoder, "beam_center_x", message.beam_center_x);
|
||||
CBOR_ENC(mapEncoder, "beam_center_y", message.beam_center_y);
|
||||
CBOR_ENC(mapEncoder, "user_data", message.user_data.dump());
|
||||
if (!metadata_only)
|
||||
CBOR_ENC(mapEncoder, "data", message.image);
|
||||
|
||||
Reference in New Issue
Block a user