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

feat: Addition of SoftDrop from the RecursiveTools Contrib #235

Merged
merged 75 commits into from
Aug 2, 2023
Merged

feat: Addition of SoftDrop from the RecursiveTools Contrib #235

merged 75 commits into from
Aug 2, 2023

Commits on May 24, 2023

  1. beginning work for energy correlator addition

    @cmoore24-24
    cmoore24-24 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    dccf392 View commit details
    Browse the repository at this point in the history

  2. Update _multievent.py

    @cmoore24-24
    cmoore24-24 authored May 24, 2023
    Configuration menu
    Copy the full SHA
    8cec35c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. energy correlator with array output

    @cmoore24-24
    cmoore24-24 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    df59fdc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored May 29, 2023
    Configuration menu
    Copy the full SHA
    3157569 View commit details
    Browse the repository at this point in the history

  3. fixed typo

    @cmoore24-24
    cmoore24-24 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    a536f98 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    95f8fbc View commit details
    Browse the repository at this point in the history

  5. adjusting argument positions

    @cmoore24-24
    cmoore24-24 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    890ca70 View commit details
    Browse the repository at this point in the history

  6. Adding to the ECF help message

    @cmoore24-24
    cmoore24-24 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    b69dc57 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. dask bit for ECFs

    @cmoore24-24
    cmoore24-24 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    70ef4b6 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. removing unneeded lines

    @cmoore24-24
    cmoore24-24 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    6c9e98d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    560272d View commit details
    Browse the repository at this point in the history

  2. Changing default arguments, fix typo in gend2

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    1facdaa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    ab5d5ab View commit details
    Browse the repository at this point in the history

  4. Update _ext.cpp 

    Another typo
    @cmoore24-24
    cmoore24-24 authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    4e3746c View commit details
    Browse the repository at this point in the history

  5. adding ECF test

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    c50b794 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    d6405ad View commit details
    Browse the repository at this point in the history

  7. fixing test issues

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    171e980 View commit details
    Browse the repository at this point in the history

  8. Changing some formatting

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    fe36932 View commit details
    Browse the repository at this point in the history

  9. Removing debug additions

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bfc6aab View commit details
    Browse the repository at this point in the history

  10. Updated DACS to match regular ACS

    @cmoore24-24
    cmoore24-24 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    dee219f View commit details
    Browse the repository at this point in the history

  11. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bb7893b View commit details
    Browse the repository at this point in the history

  12. linting

    @lgray
    lgray authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    b0b3747 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    fd40619 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'scikit-hep:main' into softdrop

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    8705261 View commit details
    Browse the repository at this point in the history

  3. Change to EnergyCorrelator to make normalization default

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    922a1ab View commit details
    Browse the repository at this point in the history

  4. Merge branch 'softdrop' of github.com:cmoore24-24/fastjet into softdrop

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f7fa494 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from cmoore24-24/softdrop 

    feat: Making normalized ECF default
    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1f2f131 View commit details
    Browse the repository at this point in the history

  6. Added a comment to _ext.cpp about normalization

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    29d14a6 View commit details
    Browse the repository at this point in the history

  7. Update _ext.cpp

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3137090 View commit details
    Browse the repository at this point in the history

  8. Update _ext.cpp

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    448b569 View commit details
    Browse the repository at this point in the history

  9. Begin adding SoftDrop

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    012ad2c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'scikit-hep:main' into softdrop

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6d47217 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1420f91 View commit details
    Browse the repository at this point in the history

  12. 6-7 checkpoint

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    734c27f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'softdrop' of github.com:cmoore24-24/fastjet into softdrop

    @cmoore24-24
    cmoore24-24 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    39deea4 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Cleaned unused variables, further SD work

    @cmoore24-24
    cmoore24-24 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7c0abff View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. finish adding arguments

    @cmoore24-24
    cmoore24-24 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e427e21 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    73f8ead View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. update-jun14

    @cmoore24-24
    cmoore24-24 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    37c9dca View commit details
    Browse the repository at this point in the history

  2. adding fatjet values

    @cmoore24-24
    cmoore24-24 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    a3fb86c View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. adding to single and general, dask cs

    @cmoore24-24
    cmoore24-24 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    9d0c5a1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    21b8928 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'scikit-hep:main' into softdrop

    @cmoore24-24
    cmoore24-24 authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    5a226c9 View commit details
    Browse the repository at this point in the history

  4. formatting

    @cmoore24-24
    cmoore24-24 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    c1165c6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from cmoore24-24/softdrop 

    feat: Softdrop
    @cmoore24-24
    cmoore24-24 authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ac88cac View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    8af8aa3 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. pz and test additions

    @cmoore24-24
    cmoore24-24 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    bf3a549 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    7649267 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'scikit-hep:main' into main

    @cmoore24-24
    cmoore24-24 authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    2d24718 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    753409e View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. single event softdrop test

    @cmoore24-24
    cmoore24-24 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    fc55095 View commit details
    Browse the repository at this point in the history

  2. multi event softdrop test

    @cmoore24-24
    cmoore24-24 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    f2bfcc7 View commit details
    Browse the repository at this point in the history

  3. generalevent update

    @cmoore24-24
    cmoore24-24 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    ee7aa6d View commit details
    Browse the repository at this point in the history

  4. Fixing test changes

    @cmoore24-24
    cmoore24-24 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    0bc4f73 View commit details
    Browse the repository at this point in the history

  5. Update _ext.cpp

    @cmoore24-24
    cmoore24-24 authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1dda268 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. pre-commit changes

    @cmoore24-24
    cmoore24-24 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    17e3163 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into main

    @lgray
    lgray authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    bc50d62 View commit details
    Browse the repository at this point in the history

  3. Add Dask test for softdrop

    @cmoore24-24
    cmoore24-24 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    a69d7d6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:cmoore24-24/fastjet into main

    @cmoore24-24
    cmoore24-24 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    3fe95b6 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    77b5363 View commit details
    Browse the repository at this point in the history

  6. Moving dask test to test_008

    @cmoore24-24
    cmoore24-24 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    3c8c981 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of github.com:cmoore24-24/fastjet into main 

    Conflicts:
	tests/test_002-exclusive_jets.py
    @cmoore24-24
    cmoore24-24 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    f9dd50d View commit details
    Browse the repository at this point in the history

  8. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    6fa2e94 View commit details
    Browse the repository at this point in the history

  9. Update test_002-exclusive_jets.py

    @cmoore24-24
    cmoore24-24 authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    19d51e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge branch 'main' into main

    @lgray
    lgray authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    67127ac View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'main' into main

    @lgray
    lgray authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    15e1c8e View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Addition of boolean mask option for SoftDrop

    @cmoore24-24
    cmoore24-24 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    5c114b9 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    b20b019 View commit details
    Browse the repository at this point in the history

  3. Fixing formatting issues

    @cmoore24-24
    cmoore24-24 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    67a5dbb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:cmoore24-24/fastjet into main 

    Conflicts:
	src/fastjet/_generalevent.py
	src/fastjet/_singleevent.py
    @cmoore24-24
    cmoore24-24 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    1f9000f View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    f147d97 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge branch 'main' into main

    @lgray
    lgray authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d9ae2fa View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Removing nested-loop mask

    @cmoore24-24
    cmoore24-24 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    5feb32c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Update test_002-exclusive_jets.py 

    Fix typos
    @cmoore24-24
    cmoore24-24 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    51854e1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge branch 'main' into main

    @lgray
    lgray authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    e148d93 View commit details
    Browse the repository at this point in the history