Consolidate the offline scaling/merging on two engines and delete the old classic
rotation chain:
- ScaleOnTheFly now implements ONLY the fixed-partiality model: it uses each reflection's
stored partiality as-is (1 for stills, the zeta/erf rocking-curve value already set at
prediction for rotation). Dropped the Rotation partiality recompute, the unity override,
the ceres rotation residual, and all wedge/mosaicity refinement.
- Remove Combine3D (CombineRotationObservations): its 3D-combine lives in RotationScaleMerge.
- JFJochProcess / jfjoch_scale: rotation (-P rot3d) goes through RotationScaleMerge for the
whole self-scale -> 3D combine -> scale-fulls -> merge; stills self-scale with ScaleOnTheFly
+ MergeOnTheFly. RotationScaleMerge does not support external-reference scaling, B-factor
refinement, an absorption surface or wedge refinement, so those combinations now throw
instead of silently falling back. Deleted the classic ScaleFulls / AbsorptionSurface /
SmoothImageScaleG helpers.
- CLI cleanup: drop -w/--wedge (wedge refinement) and --absorption (both tools), and the now
dead -P values rot and unity (keep fixed | rot3d). Fix the -P round-trip in the reproduced
command line.
Behaviour on the rotation path is unchanged: the full 18-crystal battery matches the
pre-cleanup metrics (SG/ISa/CC1.2/completeness) exactly on all 15 deterministic crystals.
Non-CUDA build unaffected.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
leonarski_fandClaude Opus 4.8
9f45935fd3