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.

Sign up for GitHub

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

Jump to bottom

Add probe type to the Beam model #647

Merged
merged 23 commits into from
Aug 4, 2023
Merged

Add probe type to the Beam model #647

merged 23 commits into from
Aug 4, 2023

Commits on Jul 21, 2023

  1. Add a probe enum

    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    c981f71 View commit details
    Browse the repository at this point in the history

  2. get_probe accessor

    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    bae2822 View commit details
    Browse the repository at this point in the history

  3. probe-->Probe, and export to Python. 

    So now, can do

from dxtbx.model.beam import Probe
    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6eea2fd View commit details
    Browse the repository at this point in the history

  4. Export get_probe 

    Note the value is uninitialized!
    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    eb22c37 View commit details
    Browse the repository at this point in the history

  5. Ensure probe_ is initialized. Now we get: 

    >>> from dxtbx.model.beam import Beam
>>> b=Beam()
>>> b.get_probe()
dxtbx_model_ext.Probe.xray
    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2b79fd8 View commit details
    Browse the repository at this point in the history

  6. Add set_probe and export. 

    Now this works:

>>> from dxtbx.model.beam import Beam
>>> b=Beam()
>>> b.get_probe()
dxtbx_model_ext.Probe.xray
>>> from dxtbx.model.beam import Probe
>>> b.set_probe(Probe.neutron)
>>> b.get_probe()
dxtbx_model_ext.Probe.neutron
    @dagewa
    dagewa committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6979e25 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Ensure probe is initialised by the other constructors too

    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e5c8839 View commit details
    Browse the repository at this point in the history

  2. Incorporate probe into equality and similarity checks

    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    48c096d View commit details
    Browse the repository at this point in the history

  3. Add get_probe_name method so that the NeXus probe name can be 

    returned for each of the defined probe values
    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    899b166 View commit details
    Browse the repository at this point in the history

  4. Include the probe in to/from dict methods and pickle suite.

    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    463391b View commit details
    Browse the repository at this point in the history

  5. Add probe to make_polarized_beam, and fix longstanding bug in that me… 

    …thod
    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    0b08c5d View commit details
    Browse the repository at this point in the history

  6. Set electron probe for various 3D ED format classes

    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f5e5441 View commit details
    Browse the repository at this point in the history

  7. News

    @dagewa
    dagewa committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    9f2400a View commit details
    Browse the repository at this point in the history

  8. Rename newsfragments/xxx.feature to newsfragments/647.feature

    @DiamondLightSource-build-server
    DiamondLightSource-build-server committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    823b075 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Merge branch 'main' into 575-beam-model-should-state-probe-type

    @dagewa
    dagewa authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    3f1a106 View commit details
    Browse the repository at this point in the history

  2. Add probe to PolychromaticBeam

    @dagewa
    dagewa committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    d2cf031 View commit details
    Browse the repository at this point in the history

  3. Fixes for tests

    @dagewa
    dagewa committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    7f0e289 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Added get_probe_from_name to Beam. Added Probe to beam_phil_scope. Ch… 

    …anged Probe in .expt files to be human readable.
    @toastisme
    toastisme committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    1f3c257 View commit details
    Browse the repository at this point in the history

  2. Added more typehints for beam.py. Added empty PolychromaticBeam const… 

    …ructor at the Python level. Fixed typo in Beam.from_dict.
    @toastisme
    toastisme committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    4312daf View commit details
    Browse the repository at this point in the history

  3. Merge pull request cctbx#654 from toastisme/beam-probe-types 

    Add probe to phil params and make probe in .expt human readable
    @dagewa
    dagewa authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    35a312c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #187 from cctbx/575-beam-model-should-state-probe-… 

    …type

575 beam model should state probe type
    @dagewa
    dagewa authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    5bdb3b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Update src/dxtbx/model/beam.h 

    Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
    @dagewa @ndevenish
    dagewa and ndevenish authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    f467e48 View commit details
    Browse the repository at this point in the history

  2. Update src/dxtbx/model/beam.h 

    Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
    @dagewa @ndevenish
    dagewa and ndevenish authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    827e494 View commit details
    Browse the repository at this point in the history