Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DiamondLightSource/python-murfey
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: DiamondLightSource/python-murfey
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: square-scores
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 11 files changed
  • 1 contributor

Commits on Feb 27, 2025

  1. Allow grid square score to be recorded in ISPyB

    @d-j-hatton
    d-j-hatton committed Feb 27, 2025
    Configuration menu
    Copy the full SHA
    289111e View commit details
    Browse the repository at this point in the history

  2. Allow updates to be made to data collection group experiment type

    @d-j-hatton
    d-j-hatton committed Feb 27, 2025
    Configuration menu
    Copy the full SHA
    547956b View commit details
    Browse the repository at this point in the history

  3. When registering a new data collection group check other data collect… 

    …ions in the group for matching grid square IDs and transfer grid squares to new data collection group

Both data collection groups will use the same data collection group IDs but will differ by tag
    @d-j-hatton
    d-j-hatton committed Feb 27, 2025
    Configuration menu
    Copy the full SHA
    55ca500 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2025

  1. Change to a dual unique constraint on ID and tag for data collection … 

    …groups
    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    42202c0 View commit details
    Browse the repository at this point in the history

  2. Compound foreign key constraint

    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    5fd9e58 View commit details
    Browse the repository at this point in the history

  3. Tomography preprpocessing parameters also require compound foreign key

    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    f1166c4 View commit details
    Browse the repository at this point in the history

  4. The tag is a string not an int

    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    725f958 View commit details
    Browse the repository at this point in the history

  5. Add score column to GridSquare table in Murfey DB

    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    e129434 View commit details
    Browse the repository at this point in the history

  6. Now need dcg_tag on TomographyPreprocessingParameters entry

    @d-j-hatton
    d-j-hatton committed Feb 28, 2025
    Configuration menu
    Copy the full SHA
    5ba500b View commit details
    Browse the repository at this point in the history
Loading