diff --git a/image_analysis/IndexAndRefine.h b/image_analysis/IndexAndRefine.h index b009cfed..fe1ea0cd 100644 --- a/image_analysis/IndexAndRefine.h +++ b/image_analysis/IndexAndRefine.h @@ -47,7 +47,7 @@ class IndexAndRefine { mutable std::mutex reflections_mutex; std::vector> reflections; - std::vector mosaicity; + std::vector mosaicity; std::vector merge_mask; IndexingOutcome DetermineLatticeAndSymmetryRotation(DataMessage &msg); diff --git a/image_analysis/scale_merge/ScaleOnTheFly.cpp b/image_analysis/scale_merge/ScaleOnTheFly.cpp index b70dd255..cc3a9c64 100644 --- a/image_analysis/scale_merge/ScaleOnTheFly.cpp +++ b/image_analysis/scale_merge/ScaleOnTheFly.cpp @@ -166,7 +166,8 @@ std::pair ScaleOnTheFly::CalculateGlobalCC(const std::vector &reflections, std::optional mosaicity_deg) { +ScaleOnTheFlyResult ScaleOnTheFly::Scale(std::vector &reflections, + std::optional mosaicity_deg) { auto start = std::chrono::steady_clock::now(); ceres::Problem problem; @@ -296,7 +297,7 @@ ScaleOnTheFlyResult ScaleOnTheFly::Scale(std::vector &reflections, s } ScalingResult ScaleOnTheFly::Scale(std::vector > &reflections, - const std::vector &mosaicity, + const std::vector &mosaicity, size_t nthreads) { ScalingResult result(reflections.size()); @@ -305,7 +306,7 @@ ScalingResult ScaleOnTheFly::Scale(std::vector > &reflec if (nthreads <= 1) { for (int i = 0; i < reflections.size(); i++) { - std::optional mos_val; + std::optional mos_val; if (model == PartialityModel::Rotation && mosaicity.size() > i && std::isfinite(mosaicity[i]) diff --git a/image_analysis/scale_merge/ScaleOnTheFly.h b/image_analysis/scale_merge/ScaleOnTheFly.h index 67007a23..fd214dd3 100644 --- a/image_analysis/scale_merge/ScaleOnTheFly.h +++ b/image_analysis/scale_merge/ScaleOnTheFly.h @@ -37,10 +37,10 @@ class ScaleOnTheFly { [[nodiscard]] std::pair CalculateGlobalCC(const std::vector &reflections) const; public: ScaleOnTheFly(const DiffractionExperiment &x, const std::vector &ref); - ScaleOnTheFlyResult Scale(std::vector &r, std::optional mosaicity_deg); + ScaleOnTheFlyResult Scale(std::vector &r, std::optional mosaicity_deg); ScalingResult Scale(std::vector > &reflections, - const std::vector &mosaicity, + const std::vector &mosaicity, size_t nthreads = 0); };