Skip to content

Conversation

@psavery
Copy link
Collaborator

@psavery psavery commented Sep 3, 2025

This fixes a few small issues with LLNL workflows, including:

  1. Disable all intensity corrections during LLNL import tool use
  2. Fix powder range highlighting (incorrect ranges were sometimes highlighted)
  3. Make canvas toolbars invisible by default, to avoid seeing them all stacked on top of each other when switching to a tabbed view
  4. Disable zoom canvas during highlight updates, to prevent the highlights from bouncing around
  5. Take into account two theta distortion when saving picks

Fixes: #1864
Fixes: #1905

@psavery psavery requested a review from saransh13 September 3, 2025 16:40
The intensity corrections cause problems during LLNL import. The
FIDDLE image plate, for example, doesn't work at all.

Just disable all intensity corrections during the LLNL import, and
the user can manually re-enable them afterward.

Signed-off-by: Patrick Avery <[email protected]>
Oftentimes, when a powder ring is highlighted, the powder range would
be highlighted incorrectly (typically a range on a different ring to
the left of the highlighted ring).

This was due to the fact that `rbnd_indices` are indices into the
two theta list, and not into the ring array.

We added a ring map to fix this, and now the correct range is always
highlighted.

Signed-off-by: Patrick Avery <[email protected]>
This fixes an issue where, when you switch to tabbed view and a bunch
of canvases get allocated, a whole bunch of toolbars also appear.

Now, only the correct toolbar will appear.

Signed-off-by: Patrick Avery <[email protected]>
They both use blitting, and unfortunately the zoom canvas does not
utilize the canvas's blit manager (which it should).

Because of that, when a blit update is being performed by both the
main canvas and the zoom canvas, there is some bouncing back and
forth in the rendering. This mainly manifests itself by the highlighted
line bouncing around.

This commit fixes the issue.

Signed-off-by: Patrick Avery <[email protected]>
We previously would not consider the tth distortion when saving
picks, so the cartesian coordinates would be incorrect.

Now we reverse the tth distortion if needed. Also, the two calibration
workflows (Composite and Fast Powder) write the coordinates directly
from the overlays, which is more accurate (some precision is lost when
converting back and forth between cartesian and polar when the tth
distortion is applied, because it is a field correction).

Signed-off-by: Patrick Avery <[email protected]>
Copy link
Member

@saransh13 saransh13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@psavery psavery merged commit 2d7343c into master Sep 4, 2025
6 checks passed
@psavery psavery deleted the fiddle-updates branch September 4, 2025 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

If 2θ distortion is applied, picks saved are incorrect Disable intensity correction settings when using LLNL import tool

3 participants