Remove cctbx.xfel dependency from dials.index #2390
Conversation
jbeilstenedmands
changed the title
Codecov Report
@@ Coverage Diff @@
## main #2390 +/- ##
==========================================
- Coverage 78.62% 78.59% -0.03%
==========================================
Files 603 608 +5
Lines 73626 74539 +913
Branches 10002 10140 +138
==========================================
+ Hits 57885 58585 +700
- Misses 13611 13787 +176
- Partials 2130 2167 +37 |
|
Hi @jbeilstenedmands I have an alternate approach I'm working on. I'll show it off in tomorrow's dials core if that's ok. Thanks! |
|
Hi @phyy-nx , no problem, my idea was to get this out in the open for discussion at the core meeting, happy to consider alternative approaches. |
|
I will note that the fundamental issue is however circular dependencies. Any effort to make the graphs acyclic will be much appreciated. |
|
Conversation here: #2076 (comment) |
|
Closing, as #2404 will provide the solution to the issue |
|
After internal discussion we decided that we'd like to reconsider merging this, so that we can get e.g. serial tooling working on conda builds - and to revert when the alternate serialtbx stuff is ready to go. To be discussed in the meeting later this week, I guess. |
|
After discussion at DIALS-core, we've agreed to merge this for release, but to add the immediate revert to #2404 so that it's undone when serialtbx is ready. |
This reverts commit 867d1d6.
* Port green_curve_area function * Port nave mosaicity minimizer It's agreed that this will be reverted as part of moving to serialtbx
DIALS and dxtbx have had dependencies on cctbx_project/xfel, and vice versa. This PR is one of 8 that will break the cyclic dependency. Notably for DIALS, this specifically moves sublattice_helper from xfel to dials.algorithms.integration and removes: @pytest.mark.xfel For more detail, see cctbx/cctbx_project#872 and cctbx/dxtbx#627 Closes #2076 and #2389 Commits: * max_like moved from xfel to serialtbx * Time code moved from xfel to serialtbx * green_curve_area and ewald_proximal_volume moved to serialtbx * sublattice_helper moved in from xfel. Within dials.stills_process, create negative control for background modeling or validation. * Change import of sublattice_helper * ConstructFrame moved to serialtbx * Remove check for xfel in tests * Fix import * Remove pytest xfel mark * Temporarily checkout dxtbx and cctbx serial_tbx branches * Revert "Remove cctbx.xfel dependency from dials.index (#2390)" * Revert "Temporarily checkout dxtbx and cctbx serial_tbx branches" * Use latest CCTBX nightly for prebuilt --------- Co-authored-by: Nicholas Sauter <nksauter@lbl.gov> Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
A port of two functions from
cctbx.xfelto remove the dependency oncctbx.xfelfor stills indexing.For #2389, #2076