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

Feature/GitHub actions #56

Open
wants to merge 66 commits into
base: main
Choose a base branch
from
Open

Feature/GitHub actions #56

wants to merge 66 commits into from

Commits on Jun 6, 2020

  1. Merge tag 'v1.2.1' into develop 

    no message
    @nsoblath
    nsoblath committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    41f8ebc View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge tag 'v1.2.2' into develop 

    Morpho install fix
    @nsoblath
    nsoblath committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    2d40849 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. can use helium instead of krypton as second gas

    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    f21d7f9 View commit details
    Browse the repository at this point in the history

  2. FakeDataGenerator using KrComplexLineShape 

    Made lineshape base shape configurable in KrComplexLineShape.py.
FakeDataGenerator.py now imports and configures KrComplexLineShape.py
instead of using functions in KrLineshapeFunctions.
    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    6ec42ec View commit details
    Browse the repository at this point in the history

  3. added scatter_proportion configurable

    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    a6ec33b View commit details
    Browse the repository at this point in the history

  4. small fixes

    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    7130957 View commit details
    Browse the repository at this point in the history

  5. scatter_spectra.npy file does not need to pre-exist. KrLineshapeFunct… 

    …ions no longer used.
    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    8897a18 View commit details
    Browse the repository at this point in the history

  6. Added delta base shape option; removed extra input to spectrum_func_1

    Talia Weiss committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    754024b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/helium-in-lineshape' of https://github.com/proj… 

    …ect8/mermithid into feature/helium-in-lineshape
    Talia Weiss committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    fd8e7bd View commit details
    Browse the repository at this point in the history

  8. some fixes

    @cclaessens
    cclaessens committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    0c8e97f View commit details
    Browse the repository at this point in the history

  9. Added option to normalize complex lineshape

    Talia Weiss committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    c10eccd View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/helium-in-lineshape' of https://github.com/proj… 

    …ect8/mermithid into feature/helium-in-lineshape
    Talia Weiss committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    14425bd View commit details
    Browse the repository at this point in the history

  11. Fixed errors

    Talia Weiss committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    f984639 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. iminuit binned data fitter

    @cclaessens
    cclaessens committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    e733607 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2020

  1. Fixed wrong var name for survival prob

    Talia Weiss committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    b5b2db1 View commit details
    Browse the repository at this point in the history

  2. added Ar scatter

    @huyanxy
    huyanxy committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    ea6af4e View commit details
    Browse the repository at this point in the history

  3. added Ar scatter

    @huyanxy
    huyanxy committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    13d77de View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. info only printed when print level is 1

    @cclaessens
    cclaessens committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    9002d63 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Merge branch 'feature/helium-in-lineshape' into feature/iminuit_histo… 

    …gram_fitter
    @cclaessens
    cclaessens committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    6a3ff1d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. Removed lineshape normalization option (was not working)

    Talia Weiss committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    8ee8a2f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Install iminuit in the Dockerfile (temporary; will eventually be done… 

    … in p8compute_dependencies)
    @nsoblath
    nsoblath committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    e89af4a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. returning lists

    @cclaessens
    cclaessens committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    d427805 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. added results logging for print_level 1

    @cclaessens
    cclaessens committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    24c54be View commit details
    Browse the repository at this point in the history

  2. option to tilt efficiency curve

    @cclaessens
    cclaessens committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    f13d44b View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Merge pull request #44 from project8/feature/iminuit_in_docker 

    Install iminuit in the Dockerfile (temporary; will eventually be done…
    @cclaessens
    cclaessens authored Jul 13, 2020
    Configuration menu
    Copy the full SHA
    d75f524 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. added return True to remove configure error

    @cclaessens
    cclaessens committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    7b8cebe View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Added option to set maxf for testing

    Talia Weiss committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    40e6060 View commit details
    Browse the repository at this point in the history

  2. Pulling changes from origin 

    Merge branch 'feature/weiss_changes' of https://github.com/morphoorg/morpho into feature/weiss_changes
Merge branch 'feature/weiss_changes' of https://github.com/morphoorg/morpho into feature/weiss_changes
Merge branch 'feature/helium-in-lineshape' of https://github.com/project8/mermithid into feature/helium-in-lineshape
    Talia Weiss committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    51afbb0 View commit details
    Browse the repository at this point in the history

  3. Cosmetic changes; added to description of num_points_in_std_array

    Talia Weiss committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    a2a91aa View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Merge pull request #43 from project8/feature/helium-in-lineshape 

    Feature/helium in lineshape
    @cclaessens
    cclaessens authored Jul 21, 2020
    Configuration menu
    Copy the full SHA
    6cdc763 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge branch 'develop' into feature/iminuit_histogram_fitter

    @cclaessens
    cclaessens committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    cb423c4 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2020

  1. added error message for expectation < 0 

    also some small changes adressing other review comments
    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    afa7fa9 View commit details
    Browse the repository at this point in the history

  2. moved BinnedDataFitter to Fitters

    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    d1b654c View commit details
    Browse the repository at this point in the history

  3. reverted changes in fake data generator

    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    227216f View commit details
    Browse the repository at this point in the history

  4. added new test script to test.sh

    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    6c9bb9c View commit details
    Browse the repository at this point in the history

  5. added molecular final states in fake data generator

    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    fbe046c View commit details
    Browse the repository at this point in the history

  6. added final state spectrum

    @cclaessens
    cclaessens committed Aug 16, 2020
    Configuration menu
    Copy the full SHA
    81279a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. final state spectrum shifted so largest binding energy is 0. 

    also final state file is now read in in internal config and final state
array is passed on to spectral_rates function.
    @cclaessens
    cclaessens committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    a2c146f View commit details
    Browse the repository at this point in the history

  2. back to get_param_states() because of backwards compatibility

    @cclaessens
    cclaessens committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    36e8da5 View commit details
    Browse the repository at this point in the history

  3. Changed name of PDF to model because it isn't actually a pdf. Extende… 

    …d description.
    @cclaessens
    cclaessens committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    a6d2ec5 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Added option to pass already binned data

    @cclaessens
    cclaessens committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    3d91729 View commit details
    Browse the repository at this point in the history

  2. minor rearrangements in test script

    @cclaessens
    cclaessens committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    fa42e79 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #45 from project8/feature/iminuit_histogram_fitter 

    Feature/iminuit histogram fitter
    @cclaessens
    cclaessens authored Aug 19, 2020
    Configuration menu
    Copy the full SHA
    fbd21ba View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. small fix in fake data generator

    @cclaessens
    cclaessens committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    22f365e View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. I believe we are not using this file anymore

    @cclaessens
    cclaessens committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    5e9b212 View commit details
    Browse the repository at this point in the history

  2. Update setup.py

    @guiguem
    guiguem authored Oct 26, 2020
    Configuration menu
    Copy the full SHA
    407ba35 View commit details
    Browse the repository at this point in the history

  3. fix type error in IO_test script

    @cclaessens
    cclaessens committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    c78f987 View commit details
    Browse the repository at this point in the history

  4. Adding a iminiut super simple tester which should pass tests while th… 

    …e processor test doesn't...
    @guiguem
    guiguem committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    8a2079a View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. added iminuit test more similar to BinnedDataFitter

    @cclaessens
    cclaessens committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    efc315d View commit details
    Browse the repository at this point in the history

  2. print_level=1 was causing the problem

    @cclaessens
    cclaessens committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    56b5161 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Merge pull request #50 from project8/feature/iminuit_check 

    Testing whether develop tests are successful as they are
    @cclaessens
    cclaessens authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    2b30d7e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48 from project8/develop 

    Merging back develop into the feature branch
    @cclaessens
    cclaessens authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    5c68ffb View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. added logger error output in BinnedDataFitter and made min_energy in … 

    …FakeDAtaGenerator configurable.
    @cclaessens
    cclaessens committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    5d06520 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. removed commented plots

    @cclaessens
    cclaessens committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    f105e41 View commit details
    Browse the repository at this point in the history

  2. iminuit.from_array_func and others were removed in iminuit >= 2

    @cclaessens
    cclaessens committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    888cba4 View commit details
    Browse the repository at this point in the history

  3. start values required...

    @cclaessens
    cclaessens committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    0d43ce8 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. Merge pull request #46 from project8/feature/molecular_final_states 

    added molecular final states in fake data generator
    @cclaessens
    cclaessens authored Jan 6, 2021
    Configuration menu
    Copy the full SHA
    3c125b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. remove KrLineShapeFunctions from misc/__init__.py

    @cclaessens
    cclaessens committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    1afb3da View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49 from project8/feature/remove_KrLineshapeFuncti… 

    …ons_from_misc

I believe we are not using this file anymore
    @cclaessens
    cclaessens authored Jan 7, 2021
    Configuration menu
    Copy the full SHA
    260f19d View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Default settings were a problem if fit function had not exactly 3 fit… 

    … parameters.

I also added the correlation matrix to the return and the call of
simplex() before migrad().
    @cclaessens
    cclaessens committed May 14, 2021
    Configuration menu
    Copy the full SHA
    ec13135 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Merge pull request #54 from project8/feature/binned_data_fitter_fixes 

    Default settings were a problem if fit function had not exactly 3 fit…
    @cclaessens
    cclaessens authored Jun 4, 2021
    Configuration menu
    Copy the full SHA
    7056449 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. Add workflow for publishing the docker image

    @MCFlowMace
    MCFlowMace committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    ee8e58b View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Merge branch 'hotfix/1.2.3' into feature/github-actions

    @MCFlowMace
    MCFlowMace committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    baea5bc View commit details
    Browse the repository at this point in the history

  2. Update to full workflow

    @MCFlowMace
    MCFlowMace committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    242fcf1 View commit details
    Browse the repository at this point in the history

  3. Add trigger for p8compute build

    @MCFlowMace
    MCFlowMace committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    a6e189c View commit details
    Browse the repository at this point in the history

  4. Add master branch to triggers of publish workflow

    @MCFlowMace
    MCFlowMace committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    726eca9 View commit details
    Browse the repository at this point in the history