diff --git a/reader/JFJochHDF5Reader.cpp b/reader/JFJochHDF5Reader.cpp index 2761dc06..8c5eef97 100644 --- a/reader/JFJochHDF5Reader.cpp +++ b/reader/JFJochHDF5Reader.cpp @@ -307,6 +307,8 @@ void JFJochHDF5Reader::ReadFile(const std::string& filename) { dataset->experiment.IndexingAlgorithm(IndexingAlgorithmEnum::FFT); else if (indexing == "ffbidx") dataset->experiment.IndexingAlgorithm(IndexingAlgorithmEnum::FFBIDX); + + dataset->scale_factor = master_file->ReadOptVector("/entry/MX/imageScaleFactor"); } auto ring_current_A = master_file->GetOptFloat("/entry/source/current"); diff --git a/reader/JFJochReaderDataset.h b/reader/JFJochReaderDataset.h index 282d91e4..b1268f94 100644 --- a/reader/JFJochReaderDataset.h +++ b/reader/JFJochReaderDataset.h @@ -41,6 +41,8 @@ struct JFJochReaderDataset { std::vector mosaicity_deg; std::vector b_factor; + std::vector scale_factor; + std::vector max_value; std::vector roi; diff --git a/viewer/JFJochViewerDatasetInfo.cpp b/viewer/JFJochViewerDatasetInfo.cpp index 516cf33d..2029b10b 100644 --- a/viewer/JFJochViewerDatasetInfo.cpp +++ b/viewer/JFJochViewerDatasetInfo.cpp @@ -90,6 +90,10 @@ void JFJochViewerDatasetInfo::UpdateLabels() { combo_box->addItem("Mosaicity", 9); } + if (!dataset->scale_factor.empty()) { + combo_box->insertSeparator(1000); + combo_box->addItem("Scale factor", 10); + } for (int i = 0; i < this->dataset->roi.size(); i++) { std::string name = std::string("ROI ") + this->dataset->roi[i]; combo_box->insertSeparator(1000); @@ -167,6 +171,8 @@ void JFJochViewerDatasetInfo::UpdatePlot() { data = dataset->b_factor; } else if (val == 9) { data = dataset->mosaicity_deg; + } else if (val == 10) { + data = dataset->scale_factor; } else if (val >= 100) { int roi_index = (val - 100) / 4;