Fast DP: Fast Data Processsing with XDS
Project description
=======================================
Fast DP: Fast Data Processsing with XDS
=======================================
.. image:: https://img.shields.io/pypi/v/fast_dp.svg
:target: https://pypi.python.org/pypi/fast_dp
:alt: PyPI release
.. image:: https://travis-ci.com/DiamondLightSource/fast_dp.svg?branch=master
:target: https://travis-ci.com/DiamondLightSource/fast_dp
:alt: Build status
.. image:: https://pyup.io/repos/github/DiamondLightSource/fast_dp/shield.svg
:target: https://pyup.io/repos/github/DiamondLightSource/fast_dp/
:alt: Updates
.. image:: https://img.shields.io/pypi/pyversions/fast_dp.svg
:target: https://pypi.org/project/fast-dp/
:alt: Supported Python versions
.. image:: https://pyup.io/repos/github/DiamondLightSource/fast_dp/python-3-shield.svg
:target: https://pyup.io/repos/github/DiamondLightSource/fast_dp/
:alt: Python 3 ready
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black
:alt: Code style: black
Introduction
------------
Fast DP is a small Python program which uses XDS, CCP4 & CCTBX to deliver
data processing results very quickly: quite how quickly will depend on the
operating environment. In essence, the first image in the sweep is passed
to the program, it's header read and then XDS used to index with a triclinic
lattice using spots drawn from small wedges of data around the start, 45
degrees in and 90 degrees in (or as close as possible to this). Integration
is then performed in parallel, either using multiple cores or multiple
processors if the XDS forkintegrate script is appropriately configured. The
data are then scaled with XDS, still in P1, before analysis with Pointless.
Finally the analysis from Pointless and the global postrefinement results
from the XDS CORRECT step are then used to select a pointgroup, after which
the data are re-scaled with XDS in this pointgroup and merged with Aimless.
At Diamond Light Source, using an appropriately configured cluster with a
parallel file store, this process typically takes up to two minutes for any
number of images.
Usage
^^^^^
::
fast_dp -h
Usage: fast_dp.py [options]
Options:
-h, --help show this help message and exit
-b BEAM, --beam=BEAM Beam centre: x, y (mm)
-a ATOM, --atom=ATOM Atom type (e.g. Se)
-j NUMBER_OF_JOBS, --number-of-jobs=NUMBER_OF_JOBS
Number of jobs for integration
-k NUMBER_OF_CORES, --number-of-cores=NUMBER_OF_CORES
Number of cores for integration
-J MAXIMUM_NUMBER_OF_JOBS, --maximum-number-of-jobs=MAXIMUM_NUMBER_OF_JOBS
Maximum number of jobs for integration
-c CELL, --cell=CELL Cell constants for processing, needs spacegroup
-s SPACEGROUP, --spacegroup=SPACEGROUP
Spacegroup for scaling and merging
-1 FIRST_IMAGE, --first-image=FIRST_IMAGE
First image for processing
-N LAST_IMAGE, --last-image=LAST_IMAGE
First image for processing
-r RESOLUTION_HIGH, --resolution-high=RESOLUTION_HIGH
High resolution limit
-R RESOLUTION_LOW, --resolution-low=RESOLUTION_LOW
Low resolution limit
Conventional usage, e.g. on laptop, would be e.g:
::
fast_dp ~/data/i04-BAG-training/th_8_2_0001.cbf
giving the following output on a 2011 Macbook Pro:
::
Fast_DP installed in: /Users/graeme/svn/fast_dp
Starting image: /Users/graeme/data/i04-BAG-training/th_8_2_0001.cbf
Number of jobs: 1
Number of cores: 0
Processing images: 1 -> 540
Phi range: 82.00 -> 163.00
Template: th_8_2_####.cbf
Wavelength: 0.97625
Working in: /private/tmp/fdp
All autoindexing results:
Lattice a b c alpha beta gamma
tP 57.80 57.80 150.00 90.00 90.00 90.00
oC 81.80 81.70 150.00 90.00 90.00 90.00
oP 57.80 57.80 150.00 90.00 90.00 90.00
mC 81.80 81.70 150.00 90.00 90.00 90.00
mP 57.80 57.80 150.00 90.00 90.00 90.00
aP 57.80 57.80 150.00 90.00 90.00 90.00
Mosaic spread: 0.04 < 0.06 < 0.07
Happy with sg# 89
57.80 57.80 150.00 90.00 90.00 90.00
--------------------------------------------------------------------------------
Low resolution 28.89 28.89 1.37
High resolution 1.34 5.99 1.34
Rmerge 0.062 0.024 0.420
I/sigma 13.40 44.70 1.60
Completeness 99.6 98.9 96.1
Multiplicity 5.3 5.0 2.8
Anom. Completeness 96.5 100.0 71.4
Anom. Multiplicity 2.6 3.1 1.2
Anom. Correlation 99.9 99.9 76.0
Nrefl 306284 3922 11217
Nunique 57886 786 4030
Mid-slope 1.007
dF/F 0.075
dI/sig(dI) 0.823
--------------------------------------------------------------------------------
Merging point group: P 4 2 2
Unit cell: 57.78 57.78 150.01 90.00 90.00 90.00
Processing took 00h 03m 59s (239 s) [306284 reflections]
RPS: 1277.6
The main result is the file fast_dp.mtz containing the scaled and merged
intensities, a log file from Aimless for plotting the merging statistics
and the information above in fast_dp.log.
See also fast_rdp to rerun last steps to change choices.
If you find fast_dp useful please cite |fastdp_doi_badge| as a DOI for the
source code and / or:
`Winter, G. & McAuley, K. E.
"Automated data collection for macromolecular crystallography."
Methods 55, 81-93 (2011).
<https://doi.org/10.1016/j.ymeth.2011.06.010>`_
Please also cite XDS, CCTBX & CCP4:
`Kabsch, W.
"XDS."
Acta Cryst. D66, 125-132 (2010)
<https://doi.org/10.1107/S0907444909047337>`_
`Grosse-Kunstleve, R. W., Sauter, N. K., Moriarty, N. W., and Adams, P. D.
"The Computational Crystallography Toolbox: crystallographic algorithms
in a reusable software framework"
J. Appl. Cryst. (2002). 35, 126-136
<https://doi.org/10.1107/S0021889801017824>`_
`Winn, M. D. et al.
"Overview of the CCP4 suite and current developments"
Acta. Cryst. D67, 235-242 (2011)
<https://doi.org/10.1107/S0907444910045749>`_
Dependencies
------------
fast_dp depends on:
* XDS
* CCP4
* CCTBX
If all of these are installed and configured no further work is needed. For
parallel operation in integration a forkintegrate script is needed to send
jobs to your queuing system.
Installation
------------
You can install the latest release version of fast_dp from PyPI by loading
your CCTBX environment and then running
::
libtbx.pip install fast_dp
and update an existing installation to a newer version with
::
libtbx.pip install --upgrade fast_dp
You will then have to run eg.
::
libtbx.configure libtbx
to make sure all command line programs are set up correctly.
Installation for developers
^^^^^^^^^^^^^^^^^^^^^^^^^^^
If you are a developer then you can run
::
libtbx.install fast_dp
instead. This will check out a development copy of fast_dp into the cctbx
modules directory and then install that to the system. To update your
development copy you will need to update the repository as usual and then
run
::
libtbx.python setup.py develop
in the source directory.
Coding Standards
^^^^^^^^^^^^^^^^
With prejudice the style guide for fast_dp is consistent PEP8 as
implemented by black https://black.readthedocs.io/en/stable/ -
installation is close to trivial (pip3 install black) and run _with no
options_ i.e. in fast_dp directory
::
black .
will do what is needed to return the formatting to the defaults so
that the diffs show only the code diffs not any formatting
differences. There is no intention to be heavy handed about this, but
having a style guide helps developers who contribute as there is no doubt.
Assumptions
-----------
The XDS.INP files generated by fast_dp make the following assumptions:
* All scans are about a single axis, approximately parallel to the detector
"fast" axis (multi-axis goniometers are fine provided the axis for the
scan is fixed)
* The detector is not offset in two-theta i.e. the beam is approximately
perpendicular to the detector face.
* Currently templates are included for Pilatus 2M & 6M, ADSC and Rayonix CCD
detectors - modification to other detectors may be possible.
Support
-------
fast_dp is provided with no guarantee of support however "best effort" support
will be provided on contacting scientificsoftware@diamond.ac.uk. Users may be
asked to provide example data in the event of a bug report.
Acknowledgements
----------------
fast_dp was developed at Diamond Light Source with the specific purpose of
providing feedback to users about the merging statistics of their data in the
shortest possible time. Clearly, however, it is very much dependent on XDS
and it's intrinsic parallelisation as well as CCP4 and CCTBX to operate, and
without these fast_dp could not exist.
License
-------
Copyright 2014 Diamond Light Source
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Release Process
---------------
To prepare a new fast_dp release you need to install
`bumpversion <https://pypi.org/project/bumpversion/>`_,
for example by running
::
pip install bumpversion
or using ``libtbx.pip`` in an CCTBX environment, followed by a
``libtbx.configure``. Releases can then be made by:
::
# Assuming current version is 1.1.1
bumpversion major # 1.1.1 -> 2.0.0
# or
bumpversion minor # 1.1.1 -> 1.2.0
# or
bumpversion patch # 1.1.1 -> 1.1.2
git push
git push --tags
The release tag, once pushed to Github, will be picked up by Travis
which will generate a new package and upload it directly to PyPI.
.. |fastdp_doi_badge| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.13039.svg
:align: top
:target: https://doi.org/10.5281/zenodo.13039
:alt: 10.5281/zenodo.13039
=======
History
=======
1.2.0 (2018-12-03)
------------------
* fast_dp and fast_rdp return with a non-zero exit code
when processing fails.
1.1.2 (2018-11-22)
------------------
* Catch case where diffraction strong to edge of detector.
1.1.1 (2018-11-21)
------------------
* Write out correct r_meas value in the fast_dp.json file.
1.1.0 (2018-11-15)
------------------
* fast_dp.json format has changed. Scaling statistics are now
stored in a structured dictionary.
(`#28 <https://github.com/DiamondLightSource/fast_dp/pull/28>`_)
* removed XDS.INP templates; now calculated on demand using dxtbx
models from DIALS, thus allowing support for all beamlines
currently understood by DIALS
1.0.0 (2018-10-31)
------------------
* First release on PyPI.
Fast DP: Fast Data Processsing with XDS
=======================================
.. image:: https://img.shields.io/pypi/v/fast_dp.svg
:target: https://pypi.python.org/pypi/fast_dp
:alt: PyPI release
.. image:: https://travis-ci.com/DiamondLightSource/fast_dp.svg?branch=master
:target: https://travis-ci.com/DiamondLightSource/fast_dp
:alt: Build status
.. image:: https://pyup.io/repos/github/DiamondLightSource/fast_dp/shield.svg
:target: https://pyup.io/repos/github/DiamondLightSource/fast_dp/
:alt: Updates
.. image:: https://img.shields.io/pypi/pyversions/fast_dp.svg
:target: https://pypi.org/project/fast-dp/
:alt: Supported Python versions
.. image:: https://pyup.io/repos/github/DiamondLightSource/fast_dp/python-3-shield.svg
:target: https://pyup.io/repos/github/DiamondLightSource/fast_dp/
:alt: Python 3 ready
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black
:alt: Code style: black
Introduction
------------
Fast DP is a small Python program which uses XDS, CCP4 & CCTBX to deliver
data processing results very quickly: quite how quickly will depend on the
operating environment. In essence, the first image in the sweep is passed
to the program, it's header read and then XDS used to index with a triclinic
lattice using spots drawn from small wedges of data around the start, 45
degrees in and 90 degrees in (or as close as possible to this). Integration
is then performed in parallel, either using multiple cores or multiple
processors if the XDS forkintegrate script is appropriately configured. The
data are then scaled with XDS, still in P1, before analysis with Pointless.
Finally the analysis from Pointless and the global postrefinement results
from the XDS CORRECT step are then used to select a pointgroup, after which
the data are re-scaled with XDS in this pointgroup and merged with Aimless.
At Diamond Light Source, using an appropriately configured cluster with a
parallel file store, this process typically takes up to two minutes for any
number of images.
Usage
^^^^^
::
fast_dp -h
Usage: fast_dp.py [options]
Options:
-h, --help show this help message and exit
-b BEAM, --beam=BEAM Beam centre: x, y (mm)
-a ATOM, --atom=ATOM Atom type (e.g. Se)
-j NUMBER_OF_JOBS, --number-of-jobs=NUMBER_OF_JOBS
Number of jobs for integration
-k NUMBER_OF_CORES, --number-of-cores=NUMBER_OF_CORES
Number of cores for integration
-J MAXIMUM_NUMBER_OF_JOBS, --maximum-number-of-jobs=MAXIMUM_NUMBER_OF_JOBS
Maximum number of jobs for integration
-c CELL, --cell=CELL Cell constants for processing, needs spacegroup
-s SPACEGROUP, --spacegroup=SPACEGROUP
Spacegroup for scaling and merging
-1 FIRST_IMAGE, --first-image=FIRST_IMAGE
First image for processing
-N LAST_IMAGE, --last-image=LAST_IMAGE
First image for processing
-r RESOLUTION_HIGH, --resolution-high=RESOLUTION_HIGH
High resolution limit
-R RESOLUTION_LOW, --resolution-low=RESOLUTION_LOW
Low resolution limit
Conventional usage, e.g. on laptop, would be e.g:
::
fast_dp ~/data/i04-BAG-training/th_8_2_0001.cbf
giving the following output on a 2011 Macbook Pro:
::
Fast_DP installed in: /Users/graeme/svn/fast_dp
Starting image: /Users/graeme/data/i04-BAG-training/th_8_2_0001.cbf
Number of jobs: 1
Number of cores: 0
Processing images: 1 -> 540
Phi range: 82.00 -> 163.00
Template: th_8_2_####.cbf
Wavelength: 0.97625
Working in: /private/tmp/fdp
All autoindexing results:
Lattice a b c alpha beta gamma
tP 57.80 57.80 150.00 90.00 90.00 90.00
oC 81.80 81.70 150.00 90.00 90.00 90.00
oP 57.80 57.80 150.00 90.00 90.00 90.00
mC 81.80 81.70 150.00 90.00 90.00 90.00
mP 57.80 57.80 150.00 90.00 90.00 90.00
aP 57.80 57.80 150.00 90.00 90.00 90.00
Mosaic spread: 0.04 < 0.06 < 0.07
Happy with sg# 89
57.80 57.80 150.00 90.00 90.00 90.00
--------------------------------------------------------------------------------
Low resolution 28.89 28.89 1.37
High resolution 1.34 5.99 1.34
Rmerge 0.062 0.024 0.420
I/sigma 13.40 44.70 1.60
Completeness 99.6 98.9 96.1
Multiplicity 5.3 5.0 2.8
Anom. Completeness 96.5 100.0 71.4
Anom. Multiplicity 2.6 3.1 1.2
Anom. Correlation 99.9 99.9 76.0
Nrefl 306284 3922 11217
Nunique 57886 786 4030
Mid-slope 1.007
dF/F 0.075
dI/sig(dI) 0.823
--------------------------------------------------------------------------------
Merging point group: P 4 2 2
Unit cell: 57.78 57.78 150.01 90.00 90.00 90.00
Processing took 00h 03m 59s (239 s) [306284 reflections]
RPS: 1277.6
The main result is the file fast_dp.mtz containing the scaled and merged
intensities, a log file from Aimless for plotting the merging statistics
and the information above in fast_dp.log.
See also fast_rdp to rerun last steps to change choices.
If you find fast_dp useful please cite |fastdp_doi_badge| as a DOI for the
source code and / or:
`Winter, G. & McAuley, K. E.
"Automated data collection for macromolecular crystallography."
Methods 55, 81-93 (2011).
<https://doi.org/10.1016/j.ymeth.2011.06.010>`_
Please also cite XDS, CCTBX & CCP4:
`Kabsch, W.
"XDS."
Acta Cryst. D66, 125-132 (2010)
<https://doi.org/10.1107/S0907444909047337>`_
`Grosse-Kunstleve, R. W., Sauter, N. K., Moriarty, N. W., and Adams, P. D.
"The Computational Crystallography Toolbox: crystallographic algorithms
in a reusable software framework"
J. Appl. Cryst. (2002). 35, 126-136
<https://doi.org/10.1107/S0021889801017824>`_
`Winn, M. D. et al.
"Overview of the CCP4 suite and current developments"
Acta. Cryst. D67, 235-242 (2011)
<https://doi.org/10.1107/S0907444910045749>`_
Dependencies
------------
fast_dp depends on:
* XDS
* CCP4
* CCTBX
If all of these are installed and configured no further work is needed. For
parallel operation in integration a forkintegrate script is needed to send
jobs to your queuing system.
Installation
------------
You can install the latest release version of fast_dp from PyPI by loading
your CCTBX environment and then running
::
libtbx.pip install fast_dp
and update an existing installation to a newer version with
::
libtbx.pip install --upgrade fast_dp
You will then have to run eg.
::
libtbx.configure libtbx
to make sure all command line programs are set up correctly.
Installation for developers
^^^^^^^^^^^^^^^^^^^^^^^^^^^
If you are a developer then you can run
::
libtbx.install fast_dp
instead. This will check out a development copy of fast_dp into the cctbx
modules directory and then install that to the system. To update your
development copy you will need to update the repository as usual and then
run
::
libtbx.python setup.py develop
in the source directory.
Coding Standards
^^^^^^^^^^^^^^^^
With prejudice the style guide for fast_dp is consistent PEP8 as
implemented by black https://black.readthedocs.io/en/stable/ -
installation is close to trivial (pip3 install black) and run _with no
options_ i.e. in fast_dp directory
::
black .
will do what is needed to return the formatting to the defaults so
that the diffs show only the code diffs not any formatting
differences. There is no intention to be heavy handed about this, but
having a style guide helps developers who contribute as there is no doubt.
Assumptions
-----------
The XDS.INP files generated by fast_dp make the following assumptions:
* All scans are about a single axis, approximately parallel to the detector
"fast" axis (multi-axis goniometers are fine provided the axis for the
scan is fixed)
* The detector is not offset in two-theta i.e. the beam is approximately
perpendicular to the detector face.
* Currently templates are included for Pilatus 2M & 6M, ADSC and Rayonix CCD
detectors - modification to other detectors may be possible.
Support
-------
fast_dp is provided with no guarantee of support however "best effort" support
will be provided on contacting scientificsoftware@diamond.ac.uk. Users may be
asked to provide example data in the event of a bug report.
Acknowledgements
----------------
fast_dp was developed at Diamond Light Source with the specific purpose of
providing feedback to users about the merging statistics of their data in the
shortest possible time. Clearly, however, it is very much dependent on XDS
and it's intrinsic parallelisation as well as CCP4 and CCTBX to operate, and
without these fast_dp could not exist.
License
-------
Copyright 2014 Diamond Light Source
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Release Process
---------------
To prepare a new fast_dp release you need to install
`bumpversion <https://pypi.org/project/bumpversion/>`_,
for example by running
::
pip install bumpversion
or using ``libtbx.pip`` in an CCTBX environment, followed by a
``libtbx.configure``. Releases can then be made by:
::
# Assuming current version is 1.1.1
bumpversion major # 1.1.1 -> 2.0.0
# or
bumpversion minor # 1.1.1 -> 1.2.0
# or
bumpversion patch # 1.1.1 -> 1.1.2
git push
git push --tags
The release tag, once pushed to Github, will be picked up by Travis
which will generate a new package and upload it directly to PyPI.
.. |fastdp_doi_badge| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.13039.svg
:align: top
:target: https://doi.org/10.5281/zenodo.13039
:alt: 10.5281/zenodo.13039
=======
History
=======
1.2.0 (2018-12-03)
------------------
* fast_dp and fast_rdp return with a non-zero exit code
when processing fails.
1.1.2 (2018-11-22)
------------------
* Catch case where diffraction strong to edge of detector.
1.1.1 (2018-11-21)
------------------
* Write out correct r_meas value in the fast_dp.json file.
1.1.0 (2018-11-15)
------------------
* fast_dp.json format has changed. Scaling statistics are now
stored in a structured dictionary.
(`#28 <https://github.com/DiamondLightSource/fast_dp/pull/28>`_)
* removed XDS.INP templates; now calculated on demand using dxtbx
models from DIALS, thus allowing support for all beamlines
currently understood by DIALS
1.0.0 (2018-10-31)
------------------
* First release on PyPI.
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distribution
fast_dp-1.2.tar.gz
(33.9 kB
view details)
Built Distribution
fast_dp-1.2-py2.py3-none-any.whl
(41.8 kB
view details)
File details
Details for the file fast_dp-1.2.tar.gz
.
File metadata
- Download URL: fast_dp-1.2.tar.gz
- Upload date:
- Size: 33.9 kB
- Tags: Source
- Uploaded using Trusted Publishing? No
- Uploaded via: twine/1.12.1 pkginfo/1.4.2 requests/2.20.1 setuptools/40.6.2 requests-toolbelt/0.8.0 tqdm/4.28.1 CPython/3.7.1
File hashes
Algorithm | Hash digest | |
---|---|---|
SHA256 | f00c3b8d8453b0f8141ff361edd21435c6e3d532098eeacb82335a935f0afcc2 |
|
MD5 | 19f603fff236b02420f597f529ab0fcb |
|
BLAKE2b-256 | 4cdee4df26cd84f472fe2c776a89004b4e03643a5271f03854052b0f151c70e9 |
File details
Details for the file fast_dp-1.2-py2.py3-none-any.whl
.
File metadata
- Download URL: fast_dp-1.2-py2.py3-none-any.whl
- Upload date:
- Size: 41.8 kB
- Tags: Python 2, Python 3
- Uploaded using Trusted Publishing? No
- Uploaded via: twine/1.12.1 pkginfo/1.4.2 requests/2.20.1 setuptools/40.6.2 requests-toolbelt/0.8.0 tqdm/4.28.1 CPython/3.7.1
File hashes
Algorithm | Hash digest | |
---|---|---|
SHA256 | b7c9c8f89949fcd25080c9d52476511a44c0fba9fae7a3eab5d431b417ef71b7 |
|
MD5 | 1af5b796e9e539b25d379df446bcf29f |
|
BLAKE2b-256 | 05dc9bc965a77339b203e6c4154c2749bf32b40825f8d5dbdaf9b783264a3d63 |