mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 38 Wiki Activity

ScaleAndMerge: rotation wedge can be refined

Browse Source
This commit is contained in:
leonarski_f
2026-03-04 09:00:43 +01:00
parent 3036b1d37f
commit cd561dd3d9
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
image_analysis/scale_merge/ScaleAndMerge.cpp
View File

@@ -121,7 +121,6 @@ namespace {
weight_(SafeInv(sigma_obs, 1.0)),
delta_phi_(r.delta_phi_deg),
lp_(SafeInv(r.rlp, 1.0)),
half_wedge_(wedge_deg / 2.0),
c1_(r.zeta / std::sqrt(2.0)),
partiality_(r.partiality) {
}
@@ -130,11 +129,13 @@ namespace {
bool operator()(const T *const G,
const T *const mosaicity,
const T *const Itrue,
const T *const wedge,
T *residual) const {
T partiality;
if (mosaicity[0] >= 0.0) {
const T arg_plus = T(delta_phi_ + half_wedge_) * T(c1_) / mosaicity[0];
const T arg_minus = T(delta_phi_ - half_wedge_) * T(c1_) / mosaicity[0];
const T half_wedge = wedge[0] / T(2.0);
const T arg_plus = T(delta_phi_ + half_wedge) * T(c1_) / mosaicity[0];
const T arg_minus = T(delta_phi_ - half_wedge) * T(c1_) / mosaicity[0];
partiality = (ceres::erf(arg_plus) - ceres::erf(arg_minus)) / T(2.0);
} else
partiality = T(1.0);
@@ -148,7 +149,6 @@ namespace {
double weight_;
double delta_phi_;
double lp_;
double half_wedge_;
double c1_;
double partiality_;
};
@@ -275,17 +275,20 @@ namespace {
}
}
double wedge = opt.wedge_deg.value_or(0.0);
std::vector<bool> is_valid_hkl_slot(nhkl, false);
for (const auto &o: obs) {
switch (opt.partiality_model) {
case ScaleMergeOptions::PartialityModel::Rotation: {
auto *cost = new ceres::AutoDiffCostFunction<IntensityRotResidual, 1, 1, 1, 1>(
auto *cost = new ceres::AutoDiffCostFunction<IntensityRotResidual, 1, 1, 1, 1, 1>(
new IntensityRotResidual(*o.r, o.sigma, opt.wedge_deg.value_or(0.0)));
problem.AddResidualBlock(cost,
nullptr,
&g[o.img_id],
&mosaicity[o.img_id],
&Itrue[o.hkl_slot]);
&Itrue[o.hkl_slot],
&wedge);
}
break;
case ScaleMergeOptions::PartialityModel::Still: {
@@ -374,6 +377,10 @@ namespace {
problem.SetParameterUpperBound(&mosaicity[i], 0, opt.mosaicity_max_deg);
}
}
if (!opt.refine_wedge)
problem.SetParameterBlockConstant(&wedge);
else
problem.SetParameterLowerBound(&wedge, 0, 0.0);
}
// use all available threads

2
image_analysis/scale_merge/ScaleAndMerge.h
View File

@@ -48,6 +48,8 @@ struct ScaleMergeOptions {
int64_t image_cluster = 1;
bool refine_wedge = false;
enum class PartialityModel {Fixed, Rotation, Unity, Still} partiality_model = PartialityModel::Fixed;
};