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

Add probe to phil params and make probe in .expt human readable #654

Merged

Commits on Jul 21, 2023

  1. Add a probe enum

    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 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 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 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 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 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. Configuration menu
    Copy the full SHA
    e5c8839 View commit details
    Browse the repository at this point in the history
  2. 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 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    899b166 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    463391b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0b08c5d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f5e5441 View commit details
    Browse the repository at this point in the history
  7. News

    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. Configuration menu
    Copy the full SHA
    823b075 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Easier override of panel geometry (cctbx#644)

    When setting panels by PHIL, merge multiple definitions first by id. This fixes cctbx#299.
    dagewa authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    930be09 View commit details
    Browse the repository at this point in the history
  2. Flumpy: Don't allow converting 1D vectors to vec2/3 (cctbx#648)

    Previously, a size (3,) array would have erroneously converted
    to a 0x3 length vec3.
    
    This is now explicitly forbidden; you must pass at least a (0, 3)
    multidimensional array.
    
    Fixes cctbx#439.
    ndevenish authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    436a1b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. FormatROD (cctbx#645)

    Partial support for Rigaku Oxford Diffraction format images.
    ---------
    
    Co-authored-by: Takanori Nakane <nakane.t@gmail.com>
    Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
    3 people authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    180fac8 View commit details
    Browse the repository at this point in the history
  2. Check Registry against refl/expt files (cctbx#650)

    This was previously done implicitly, but only when dials_regression
    was present. This makes the test explicit, and works with
    dials-data (so that it will work on e.g. CI with restricted access
    to test cases).
    ndevenish authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e9b88d2 View commit details
    Browse the repository at this point in the history
  3. Make Imageset slices consistently index from 0

    Without this, slices sometimes needed to be indexed by their original
    image index, even inside the slice.
    
    The previous workaround in 67aab2 (cctbx#485) for negative offset was
    reacting to the erroneous behaviour introduced by including batch
    offsets in imagesequence slicing.
    dagewa authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    69169ff View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. MNT: Update CMake modules path relative to script

    Without this, dxtbx did not work as a subdirectory in
    a larger CMakeLists project.
    ndevenish committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0a068b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Fixes for EMBL beamlines at PETRA (cctbx#626)

    The E-32-0017 Eiger moved to P13 on 2021-5-22, where the goniometer axis no
    longer needs overriding.
    
    Check for that date in the MiniCBF, and check for the serial matching the date
    range.
    
    Co-authored-by: Christian Becke <christian.becke@fu-berlin.de>
    Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
    3 people authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    64bcb32 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Add polychromatic beam (cctbx#621)

    Add new Beam class "PolychromaticBeam" for polychromatic/multi-wavelength/wide bandpass experiments.
    
    ---------
    
    Co-authored-by: DiamondLightSource-build-server <DiamondLightSource-build-server@users.noreply.github.com>
    Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
    3 people authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    ef5f9ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3f1a106 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2cf031 View commit details
    Browse the repository at this point in the history
  4. Fixes for tests

    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 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 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    4312daf View commit details
    Browse the repository at this point in the history