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: Ivanlh20/multem
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rosalindfranklininstitute/MULTEM
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
5 contributors

Commits on Oct 30, 2019

  1. Some changes required to compile MULTEM. 

    Also added are a couple of exceptions which if not present can occasionally
result in a segmentation fault
    @jmp1985
    jmp1985 committed Oct 30, 2019
    Copy the full SHA
    d3e4fcd View commit details

  2. Changes needed to compile.

    @jmp1985
    jmp1985 committed Oct 30, 2019
    Copy the full SHA
    854d4a6 View commit details

  3. Changes required to compile matlab stuff at DLS

    @jmp1985
    jmp1985 committed Oct 30, 2019
    Copy the full SHA
    4a3ceca View commit details

Commits on Mar 18, 2020

  1. Add functions without stream

    @jmp1985
    jmp1985 committed Mar 18, 2020
    Copy the full SHA
    4087d24 View commit details

  2. Add assign_imag function

    @jmp1985
    jmp1985 committed Mar 18, 2020
    Copy the full SHA
    1c5b8fa View commit details

  3. Add potential function

    @jmp1985
    jmp1985 committed Mar 18, 2020
    Copy the full SHA
    aa5c53c View commit details

  4. Merge branch 'master' into local_required_changes

    @jmp1985
    jmp1985 committed Mar 18, 2020
    Copy the full SHA
    1c4326c View commit details

Commits on Jun 10, 2020

  1. Added test for atomic number

    @jmp1985
    jmp1985 committed Jun 10, 2020
    Copy the full SHA
    770b23d View commit details

Commits on Jun 26, 2020

  1. Added phase shift for phase plate

    @jmp1985
    jmp1985 committed Jun 26, 2020
    Copy the full SHA
    9169ba3 View commit details

Commits on Jul 22, 2020

  1. Using sort_by_key speeds up sorting atoms a lot. Still room for impro… 

    …vement though
    @jmp1985
    jmp1985 committed Jul 22, 2020
    Copy the full SHA
    b3d4340 View commit details

Commits on May 5, 2021

  1. New Tutorial

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    ab96d65 View commit details

  2. Added function to read xyz files

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    3445a8c View commit details

  3. Added function for prime number factorization

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    1002dec View commit details

  4. Added function to check STEM setup with example

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    005ed1f View commit details

  5. version 2.2.3

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    33dea84 View commit details

  6. MULTEM 2.2.3

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    11310c3 View commit details

  7. Documentation update, fixed formatting and typos

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    e922be1 View commit details

  8. Upload legacy Thrust library

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    b91f3c0 View commit details

  9. MULTEM v2.2.3

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    2e3200a View commit details

  10. Multem v2.2.3

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    b2e905c View commit details

  11. fix blas and labpack links for linux

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    b67984c View commit details

  12. cleanup

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    5a20d0e View commit details

  13. add missing file

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    73ad984 View commit details

  14. fix formatting issue

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    2628d93 View commit details

  15. update .gitignore

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    15aec1d View commit details

  16. cleanup

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    f09a8b7 View commit details

  17. remove outdated file

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    3b313a7 View commit details

  18. fix blas path for linux

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    0a0f363 View commit details

  19. multem v2.2.3

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    377466e View commit details

  20. adapt to new naming conventions

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    4acd4fc View commit details

  21. Change input structure to class implementation

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    62106fa View commit details

  22. add missing function for compilation

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    0fa1f61 View commit details

  23. fix wrong Z

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    366ad78 View commit details

  24. fix wrong Z

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    18ba147 View commit details

  25. fix input prm restriction (for e.g. 2D Materials)

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    140d0ed View commit details

  26. default for "reverse_multislice changed" to false

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    8e460d1 View commit details

  27. compiler flag changed from debug to release

    @ThFriedrich @jmp1985
    ThFriedrich authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    76ec930 View commit details

  28. amorphous change

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    f63f841 View commit details

  29. update ilm_dflt_input_multem

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    7176e16 View commit details

  30. rmsd_3d and default parameters

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    6ee6843 View commit details

  31. Z=49

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    f8532b6 View commit details

  32. crystalline specimens

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    15420cf View commit details

  33. reading from cif

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    d663598 View commit details

  34. square pixels

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    432701d View commit details

  35. Update ilm_mrad_2_rAng.m

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    c3a5bb9 View commit details

  36. change order input order of ilm_mrad_2_rAng

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    ce1f222 View commit details

  37. removing extra line

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    bd89fc8 View commit details

  38. removing EDX folder

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    6a0d82b View commit details

  39. Delete EDX directory

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    f007baf View commit details

  40. Readme update

    @Ivanlh20 @jmp1985
    Ivanlh20 authored and jmp1985 committed May 5, 2021
    Copy the full SHA
    ddc203f View commit details
Loading