Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test changes for add_properties_table_to_scan dxtbx PR #2408

Merged
merged 44 commits into from
Nov 20, 2023

Conversation

toastisme
Copy link
Collaborator

These are some minor changes required on the DIALS side when using #620. The main one being imprecision when setting oscillation

>>> scan.set_oscillation(82.0, 0.15)
>>> scan.get_oscillation()
(82.0, 0.15000000000000338)

The loss of precision happens when converting oscillation into an array. Obviously it's negligible but it does actually change things downstream (e.g. one or two reflections right on the border of a slice are now included, leading to slightly different refinement and hence integration etc.)

Copy link
Member

@dagewa dagewa left a comment

Choose a reason for hiding this comment

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

Changes look sensible to me 👍 Not looked into why the tests are failing though

@toastisme
Copy link
Collaborator Author

Not looked into why the tests are failing though

Sorry thought I had written it here somewhere: single test is failing due to a dials-data change needing to be merged first.

@ndevenish ndevenish changed the title Add properties to scan test changes Test changes for add_properties_table_to_scan dxtbx PR May 18, 2023
dagewa and others added 12 commits July 25, 2023 10:29
If the environment DIALS_REGRESSION was set with a trailing slash,
this could be passed through to tests. At least one test (test_export_mosflm)
failed in this case. Prevent this happening.
Update for changes in:
cctbx/dxtbx@69169ff

Imageset slicing is reverted back to using zero-based indices, which is
how the data is accessed. DIALS tests pass locally but some battle
testing should be done with real data (scans, stills, image numbers
starting from 1, 0, 42, etc.) to ensure the results of processing remain
the same.

Co-authored-by: James Beilsten-Edmands <[email protected]>
Don't slice using batch offsets
Add a --cmake option to bootstrap.py

This will configure and build dials, dxtbx, and xia2, and set
the environment variables so that the built artifacts can be
used without installation.

Also:
  - Give libtbx.precommit a help string
  - Install mamba into fresh conda_base environments
Fix to allow combine experiments with the need for reflection tables.

Fixes dials#1741
Fixes dials#1658
Add stereographic projection plots to dials.merge if more than one experiment
…#2483)

In such a case, disable the control and keep the beam centre as `None`.
…r than 90° (dials#2479)

Fix the image viewer for cases where the detector is in front of the crystal.
…are only applied once to each model (dials#2469)

Use a set to keep track of which models have already been manually updated, to avoid doing this more than once
dagewa and others added 20 commits August 21, 2023 10:34
Beam models now include Probe details on the type of beam.
* Port green_curve_area function
* Port nave mosaicity minimizer

It's agreed that this will be reverted as part of moving to serialtbx
Since 867d1d6, these tests no longer require the xfel module - so don't
need to be skipped.
    towncrier --name=DIALS --version='3.16.0'
The 3DED/lysozyme_nanocrystals tutorial has been left, for now, since it
is referenced in the context of a publication.

Co-authored-by: Nicholas Devenish <[email protected]>
Moves CI mac and Linux builds over to CMake (on highest supported
python) on CI. The full bootstrap, on minimum python, is still run for
linux, which also runs the XFEL regression tests.

Because we are building on linux twice, total time isn't much saved, but
the mac/new linux job is much speedier.
Increases the cell volume by a factor of 3 to more normal value and
fixes the cell dimensions.
@toastisme toastisme merged commit 7878f71 into dials:main Nov 20, 2023
11 checks passed
dagewa pushed a commit that referenced this pull request Nov 30, 2023
Updated refinement working set of reflections threshold. Updated tests to reflect this, and a change in precision for Scan oscillation.
dagewa pushed a commit that referenced this pull request Nov 30, 2023
Updated refinement working set of reflections threshold. Updated tests to reflect this, and a change in precision for Scan oscillation.
graeme-winter pushed a commit to graeme-winter/dials that referenced this pull request Nov 30, 2023
Updated refinement working set of reflections threshold. Updated tests to reflect this, and a change in precision for Scan oscillation.
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.

5 participants