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
Stage 1 remove datablock #504
Conversation
Obviously results in some DIALS test failures, but very few: Results (1352.51s): 1517 passed 3 failed - tests/model/test_experiment_list.py:534 test_experimentlist_factory_from_datablock - tests/model/test_experiment_list.py:562 test_experimentlist_to_datablock_imageset - tests/model/test_experiment_list.py:577 test_experimentlist_to_datablock_centroid_test_data
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #504 +/- ##
==========================================
- Coverage 40.75% 40.10% -0.65%
==========================================
Files 177 177
Lines 15725 15726 +1
Branches 2631 2624 -7
==========================================
- Hits 6408 6307 -101
- Misses 8745 8861 +116
+ Partials 572 558 -14 |
Question: is the dials/util/OptionParser option read_datablocks removed? |
Tasks for me to test these changes:
|
I'm working through the repos mentioned above that still use datablocks in some way. https://github.com/dermen/cxid9114There is a function https://github.com/nksauter/LS49/There are two types of datablocks in the repo. In these files, datablocks are mentioned in a docstring but not used in the code:
In these files:
datablocks are actually used. However both files use a dials ArgumentParser with kwarg read_datablocks, which was removed in dials/dials@747e241 in early 2019. Thus the current PR is not going to break anything that wasn't already broken for several years. @nksauter Do you agree with this conclusion? Now proceeding to xfel and xfel_regression which could be a bit more extensive. |
Actually there are no serious problems in cctbx_project or xfel_regression. This utility script: https://github.com/cctbx/cctbx_project/blob/master/xfel/euxfel/write_new_geom.py [edit: removed after discussion with @asmit3] will become unusable but I don't believe it has been used or tested in several years. This XFEL GUI log scraper: https://github.com/cctbx/cctbx_project/blob/master/xfel/ui/components/spotfinder_scraper.py looks for files called Now making the cctbx_project branch mentioned above to run XFEL CI on this dxtbx branch. |
@ndevenish propose that we merge this one immediately after you branch for release of 3.x |
@dwpaley we are OK with respect to LS49. The unit tests run correctly under this PR, and the NESAP benchmark produces correct images (under script https://github.com/nksauter/LS49/blob/bfab44205cbce07713efe53627eccdb55e765785/adse13_196/revapi/saul/827781.sh). |
This pipeline: https://github.com/cctbx/cctbx_project/runs/9081828838 is running xfel_regression on this branch as @phyy-nx suggested above. If "XFEL CI branch" passes then we'll be all set on our end. Not really expecting any problems directly related to this branch, but there have been a couple recent unrelated xfel_regression changes so I'll keep an eye on this. |
Got a couple issues but nothing related to datablocks. This is all good on the California end. |
Closes #336 |
This reverts commit 3dba930. Reverting while we revisit the dials regression test failures
Obviously results in some DIALS test failures, but very few:
As promised, making branch to remove
DataBlock