ScaleAndMerge: Change bounds for R

image_analysis/scale_merge/ScaleAndMerge.cpp

@@ -352,7 +352,8 @@ namespace {
         if (opt.partiality_model == ScaleMergeOptions::PartialityModel::Still) {
             for (int i = 0; i < mosaicity.size(); ++i) {
                 if (image_slot_used[i]) {
-                    problem.SetParameterLowerBound(&mosaicity[i], 0, 1e-6);
+                    problem.SetParameterLowerBound(&mosaicity[i], 0, 1e-9);
+                    problem.SetParameterUpperBound(&mosaicity[i], 0, 1.0);
                 }
             }
         }
@@ -589,7 +590,6 @@ namespace {
     void calc_obs(const ScaleMergeOptions &opt,
                std::vector<double> &g,
                std::vector<double> &mosaicity,
-               bool rotation_crystallography,
                const std::vector<ObsRef> &obs,
                std::vector<CorrectedObs> &corr_obs) {
 
@@ -775,7 +775,7 @@ ScaleMergeResult ScaleAndMergeReflectionsCeres(const std::vector<std::vector<Ref
         }
     }
 
-    calc_obs(opt, g, mosaicity, rotation_crystallography, obs, corr_obs);
+    calc_obs(opt, g, mosaicity, obs, corr_obs);
     merge(nhkl, out, corr_obs);
     stats(opt, nhkl, out, corr_obs);