v1.0.0-rc.70
This commit is contained in:
@@ -590,6 +590,10 @@ namespace {
|
||||
message.bkg_estimate = GetCBORFloat(value);
|
||||
else if (key == "adu_histogram")
|
||||
GetCBORUInt64Array(value, message.adu_histogram);
|
||||
else if (key == "beam_center_x")
|
||||
message.beam_center_x = GetCBORFloat(value);
|
||||
else if (key == "beam_center_y")
|
||||
message.beam_center_y = GetCBORFloat(value);
|
||||
else if (key == "roi_integrals")
|
||||
ProcessROIElementMap(message, value);
|
||||
else {
|
||||
@@ -873,6 +877,12 @@ namespace {
|
||||
message.overwrite = j["xfel_pulse_id"];
|
||||
if (j.contains("file_format"))
|
||||
message.file_format = ProcessHDF5Format(j["file_format"]);
|
||||
if (j.contains("poni_rot1"))
|
||||
message.poni_rot1 = j["poni_rot1"];
|
||||
if (j.contains("poni_rot2"))
|
||||
message.poni_rot2 = j["poni_rot2"];
|
||||
if (j.contains("poni_rot3"))
|
||||
message.poni_rot3 = j["poni_rot3"];
|
||||
if (j.contains("indexing_algorithm")) {
|
||||
if (j["indexing_algorithm"] == "fft")
|
||||
message.indexing_algorithm = IndexingAlgorithmEnum::FFT;
|
||||
@@ -881,6 +891,16 @@ namespace {
|
||||
else
|
||||
message.indexing_algorithm = IndexingAlgorithmEnum::None;
|
||||
}
|
||||
|
||||
if (j.contains("geom_refinement_algorithm")) {
|
||||
if (j["geom_refinement_algorithm"] == "beam_center")
|
||||
message.geom_refinement_algorithm = GeomRefinementAlgorithmEnum::BeamCenter;
|
||||
else if (j["geom_refinement_algorithm"] == "beam_center_tetragonal")
|
||||
message.geom_refinement_algorithm = GeomRefinementAlgorithmEnum::BeamCenterTetragonal;
|
||||
else
|
||||
message.geom_refinement_algorithm = GeomRefinementAlgorithmEnum::None;
|
||||
}
|
||||
|
||||
if (j.contains("ring_current_mA"))
|
||||
message.ring_current_mA = j["ring_current_mA"];
|
||||
if (j.contains("sample_temperature_K"))
|
||||
|
||||
Reference in New Issue
Block a user