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

DecayLanguage compatibility #63

Merged
merged 73 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
9254e8f
Add files for compatibility between phasespace and decaylanguage
simonthor Sep 21, 2021
79d1ccf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 21, 2021
6d5e448
Syntactic update to code for extracting mother name
simonthor Sep 26, 2021
ca5c115
Better error handling for module imports
simonthor Sep 27, 2021
54a789c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 27, 2021
e36319c
Merge branch 'decay2phasespace' of https://github.com/simonthor/phase…
simonthor Sep 27, 2021
0419501
Add pytest assert introspection to check_norm helper function
simonthor Sep 27, 2021
968cf0b
Better assertion errors for check_norm
simonthor Sep 27, 2021
03a8c80
Remove forgotten dummy assert
simonthor Sep 27, 2021
60ab982
Remove hardcoded K*0 mass and width with call to particle
simonthor Sep 27, 2021
8627d13
Move docstring for FullDecay to __init__
simonthor Sep 27, 2021
436a6d4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 27, 2021
06f0713
Make comment about map_fn more descriptive
simonthor Sep 27, 2021
f5f0ca9
Remove average from `from_dict` docstring
simonthor Sep 27, 2021
6d4268d
Remove part of comment
simonthor Sep 27, 2021
9e58f4a
Update docstrings to Google style instead of NumPy style.
simonthor Sep 27, 2021
33ef57b
Rename mass functions to use lowercase.
simonthor Oct 3, 2021
96aea99
Move most decays into a decfile
simonthor Oct 3, 2021
e610d11
Add mass functions and make tests pass
simonthor Oct 3, 2021
77830d1
Remove newline
simonthor Oct 3, 2021
f5a23ec
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 3, 2021
8e31148
Add test for mass_converter
simonthor Oct 3, 2021
090e65b
Fix test with mass_converter
simonthor Oct 3, 2021
3879e04
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 3, 2021
51e5ecb
Update default value
simonthor Oct 7, 2021
bf6f19a
Begin working on documentation notebook
simonthor Oct 7, 2021
4d9b009
Add docs about tolerance and improve former parts
simonthor Oct 7, 2021
be38a78
chore: add pre-commit hook to clean jupyter notebook
jonas-eschle Oct 8, 2021
79142cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 8, 2021
d76a967
Write about all features in fulldecay
simonthor Oct 10, 2021
02549c5
Rename fuldecay to fromdecay.
simonthor Oct 10, 2021
dec6a23
Rename fulldecay to fromdecay
simonthor Oct 10, 2021
d14d69e
Revert "Rename fulldecay to fromdecay"
simonthor Oct 12, 2021
bba9a5c
Revert "Rename fuldecay to fromdecay."
simonthor Oct 12, 2021
32cc781
Rename fulldecay to fromdecay and FullDecay to MultiDecayChain
simonthor Oct 12, 2021
f5da87c
Update setup.cfg to work with fromdecay
simonthor Oct 13, 2021
75c4a87
Update particle package version requirement
simonthor Nov 3, 2021
128a577
Add decaylanguage to package requirements
simonthor Nov 3, 2021
58f1215
Rename class to GenMultiDecay
simonthor Nov 6, 2021
b6b0e33
Add examples to docstring of GenMultiDecay.from_dict
simonthor Nov 6, 2021
30d8ab0
Format classes and packages in monospaced font
simonthor Nov 8, 2021
e1aead9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 8, 2021
434cdb8
Clarify docstring
simonthor Nov 12, 2021
0e41fc3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 12, 2021
d8062e7
Reference examples in dec_dict docstring
simonthor Nov 12, 2021
36ae8b1
decaylanguage to DecayLanguage
simonthor Nov 12, 2021
bb80371
decaylanguage to DecayLanguage
simonthor Nov 12, 2021
632e443
Same as last commit
simonthor Nov 12, 2021
0b6ec07
Make constants public
simonthor Nov 12, 2021
bbdf890
Minor clarifications
simonthor Nov 12, 2021
2a299dd
Make type hints complaiant with python < 3.9.
simonthor Nov 12, 2021
5122942
Improve code quality
simonthor Nov 12, 2021
66d3ff3
Improve code quality (2)
simonthor Nov 12, 2021
4a47428
Shorten docstring summary to improve code quality
simonthor Nov 12, 2021
decf916
Change MASS_WIDTH_TOLERANCE and DEFAULT_MASS_FUNC to class variables.
simonthor Nov 13, 2021
03f4def
Change docstring to reference class variable
simonthor Nov 13, 2021
3374b3f
Add nbval to CI
jonas-eschle Nov 14, 2021
2cf9c8c
Update ci.yml
jonas-eschle Nov 14, 2021
690e16d
Add fromdecay to test requirements
jonas-eschle Nov 14, 2021
dfe5604
Update GenMultiDecay_Tutorial.ipynb
jonas-eschle Nov 14, 2021
5853811
Update setup.cfg
jonas-eschle Nov 14, 2021
e5c9f8a
CI: correct execution place for notebook
jonas-eschle Nov 14, 2021
eae7abb
ci: explicit test directory
jonas-eschle Nov 14, 2021
d446b7c
chore: add graphviz to dependencies for notebook
jonas-eschle Nov 14, 2021
649d86d
chore: remove duplicated requirements
jonas-eschle Nov 15, 2021
b46c064
ci: add dev installation
jonas-eschle Nov 15, 2021
c88957b
ci: ignore ipynb checkpoints
jonas-eschle Nov 15, 2021
f8d0341
ci: ignore notebook
jonas-eschle Nov 15, 2021
c529263
Update setup.cfg
jonas-eschle Nov 22, 2021
c1ef3b3
fix: error with new tf version, requiring keras < 2.7
jonas-eschle Nov 24, 2021
2bd2d2f
ci: debug notebook error 1
jonas-eschle Nov 24, 2021
80f8121
ci: debug notebook error 2, adding graphviz system package
jonas-eschle Nov 24, 2021
edebaf4
Merge branch 'master' into decay2phasespace
jonas-eschle Nov 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

name: tests

on: [push]
on: [push, pull_request]

jobs:
codecov:
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --use-feature=2020-resolver -e .[test]
pip install --use-feature=2020-resolver -e .[dev]
pip install coverage
- name: Download test data
run: python data/download_test_files.py > /dev/null
Expand All @@ -48,10 +48,19 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
sudo apt-get install graphviz -y
pip install --use-feature=2020-resolver -e .[dev]
- name: Download test data
run: python data/download_test_files.py > /dev/null
- name: Test with pytest
run: PHASESPACE_EAGER=0 pytest --basetemp={envtmpdir}
run: |
PHASESPACE_EAGER=0 pytest --basetemp={envtmpdir} tests
cd docs
PHASESPACE_EAGER=0 pytest --nbval-lax --ignore=.ipynb_checkpoints
cd ..
- name: Test with pytest (eager mode)
run: PHASESPACE_EAGER=1 pytest --basetemp={envtmpdir}
run: |
PHASESPACE_EAGER=1 pytest --basetemp={envtmpdir} tests
cd docs
PHASESPACE_EAGER=1 pytest --nbval-lax --ignore=.ipynb_checkpoints
cd ..
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@ repos:
rev: v2.4.1
hooks:
- id: prettier

- repo: https://github.com/roy-ht/pre-commit-jupyter
rev: v1.2.1
hooks:
- id: jupyter-notebook-cleanup
Loading