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

Phase contribution #1737

Merged
merged 67 commits into from
Jul 16, 2024
Merged

Phase contribution #1737

merged 67 commits into from
Jul 16, 2024

Commits on Feb 19, 2024

  1. First commit, phase retrieval changes

    @hrobarts
    hrobarts committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    f6dc0f4 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Update tests

    @hrobarts
    hrobarts committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    3618c73 View commit details
    Browse the repository at this point in the history

  2. Tidy

    @hrobarts
    hrobarts committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    8f8ff6d View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Add generalised paganin method

    @hrobarts
    hrobarts committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c8dd7e2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Separate static method for filtering without -log

    @hrobarts
    hrobarts committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    cb28df4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution 

    Signed-off-by: Hannah Robarts <[email protected]>
    @hrobarts
    hrobarts committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    5bc4ce8 View commit details
    Browse the repository at this point in the history

  3. Update tests

    @hrobarts
    hrobarts committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    b39b32c View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Update docstring

    @hrobarts
    hrobarts committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    95a6270 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Small changes

    @hrobarts
    hrobarts committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    ca1520b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Remove dask dependency

    @hrobarts
    hrobarts committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    d873007 View commit details
    Browse the repository at this point in the history

  2. More tests

    @hrobarts
    hrobarts committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    5e1a2f2 View commit details
    Browse the repository at this point in the history

  3. Test update

    @hrobarts
    hrobarts committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    61d1971 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'master' into phase_contribution 

    Signed-off-by: Hannah Robarts <[email protected]>
    @hrobarts
    hrobarts committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    995735d View commit details
    Browse the repository at this point in the history

  2. Remove dask import

    @hrobarts
    hrobarts committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    64a343d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    60031c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Documentation update

    @hrobarts
    hrobarts committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    533a414 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    162825f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1ce7180 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Don't require propagation distance for filter

    @hrobarts
    hrobarts committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    b58da85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    2695678 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Add tests

    @hrobarts
    hrobarts committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    8d32470 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Move division inside filter

    @hrobarts
    hrobarts committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    5f645c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Updates from meeting

    @hrobarts
    hrobarts committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9268830 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Use Filter and PhaseRetriever classes

    @hrobarts
    hrobarts committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    a440654 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Update tests

    @hrobarts
    hrobarts committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    44f5761 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f5d5437 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Fix assertNoLogs error, add Filter tests

    @hrobarts
    hrobarts committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    29ac9b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4b66fc2 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Update following UCL discussion

    @hrobarts
    hrobarts committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a577090 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    258ac90 View commit details
    Browse the repository at this point in the history

  3. Fix test name error

    @hrobarts
    hrobarts committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    90c380d View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Clarify magnification

    @hrobarts
    hrobarts committed May 1, 2024
    Configuration menu
    Copy the full SHA
    5f43ab0 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed May 7, 2024
    Configuration menu
    Copy the full SHA
    eaf2ea7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7fee405 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Get information from geometry, remove separate filter class

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    2ab2374 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    3fdfbbe View commit details
    Browse the repository at this point in the history

  3. Update example

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    7cc56c4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    0207ecb View commit details
    Browse the repository at this point in the history

  5. Documentation updates

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    0ada661 View commit details
    Browse the repository at this point in the history

  6. Fix import error

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    3df049c View commit details
    Browse the repository at this point in the history

  7. Update changelog

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    222b1a1 View commit details
    Browse the repository at this point in the history

  8. Update warning message

    @hrobarts
    hrobarts committed May 14, 2024
    Configuration menu
    Copy the full SHA
    138053d View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Add pad option

    @hrobarts
    hrobarts committed May 22, 2024
    Configuration menu
    Copy the full SHA
    58aa4c7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0bcca3b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Move update parameters to get_output

    @hrobarts
    hrobarts committed May 24, 2024
    Configuration menu
    Copy the full SHA
    3613435 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Move update geometry/parameters to get_output

    @hrobarts
    hrobarts committed May 28, 2024
    Configuration menu
    Copy the full SHA
    94ecca5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed May 28, 2024
    Configuration menu
    Copy the full SHA
    45452c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into phase_contribution 

    Signed-off-by: Hannah Robarts <[email protected]>
    @hrobarts
    hrobarts committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c2487ca View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Add return units default cm, move full_retrieval to init

    @hrobarts
    hrobarts committed May 29, 2024
    Configuration menu
    Copy the full SHA
    8eb3f32 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Changes from review

    @hrobarts
    hrobarts committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ddcb720 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Documentation updates

    @hrobarts
    hrobarts committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    32fdb3f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    29db2d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    c2626d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Updates from Gemma's review

    @hrobarts
    hrobarts committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    3bf2ce2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    990d0dd View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Update Wrappers/Python/cil/processors/PaganinProcessor.py 

    Co-authored-by: Jakob Sauer Jørgensen <[email protected]>
Signed-off-by: Hannah Robarts <[email protected]>
    @hrobarts @jakobsj
    hrobarts and jakobsj committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    5a3e8e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Revert to just accepting string in units

    @hrobarts
    hrobarts committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    6c74408 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phase_contribution' of github.com:TomographicImaging/CI… 

    …L into phase_contribution
    @hrobarts
    hrobarts committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    570be48 View commit details
    Browse the repository at this point in the history

  3. Update tests, remove units.py

    @hrobarts
    hrobarts committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    4de6e0c View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    141f468 View commit details
    Browse the repository at this point in the history

  2. Update channel calculation, tests, warn if order is not cil

    @hrobarts
    hrobarts committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    9a06038 View commit details
    Browse the repository at this point in the history

  3. Typos

    @hrobarts
    hrobarts committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2e3ffc3 View commit details
    Browse the repository at this point in the history

  4. Typo

    @hrobarts
    hrobarts committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    b4f7b0e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    416f633 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    b9d0a43 View commit details
    Browse the repository at this point in the history

  2. Typos

    @hrobarts
    hrobarts committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a64082f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into phase_contribution

    @hrobarts
    hrobarts committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ba3bf06 View commit details
    Browse the repository at this point in the history