diff --git a/image_analysis/scale_merge/Merge.cpp b/image_analysis/scale_merge/Merge.cpp index 9415667c..f7c55350 100644 --- a/image_analysis/scale_merge/Merge.cpp +++ b/image_analysis/scale_merge/Merge.cpp @@ -12,6 +12,10 @@ #include "../../common/ResolutionShells.h" #include "HKLKey.h" +// TODO: Unit cell logic is very messy, given each reflection can have its own d value +// Need to use consistent lattice to calc resolution (which would also allow to calculate completeness) +// But this is not possible for current still workflow (while fine for rotation workflow) + std::vector CalcMergeMask(const DiffractionExperiment &x, const ScalingResult &result) { std::vector ret(result.image_cc.size(), 0); @@ -158,7 +162,8 @@ MergeStatistics MergeStats(const DiffractionExperiment &x, } if (!(d_min < d_max && d_min > 0.0f)) - throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Error in resolution calculation"); + throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, + "Error in resolution calculation"); const float d_min_pad = d_min * 0.999f; const float d_max_pad = d_max * 1.001f;