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

fix: histogram weights not handled correctly in hist / boost conversion #774

Merged
merged 31 commits into from
Nov 2, 2022
Merged

fix: histogram weights not handled correctly in hist / boost conversion #774

merged 31 commits into from
Nov 2, 2022

Commits on Oct 31, 2022

  1. remove unused dependency

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    c58c9f7 View commit details
    Browse the repository at this point in the history

  2. add missing asserts

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    c6f671a View commit details
    Browse the repository at this point in the history

  3. add test for TH1 weights from root

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    052de1a View commit details
    Browse the repository at this point in the history

  4. add test for issue

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    9f10718 View commit details
    Browse the repository at this point in the history

  5. alternative way to detect weighted hist

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    1971918 View commit details
    Browse the repository at this point in the history

  6. made fSumw2 None if storage is not weights

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    02a1ecb View commit details
    Browse the repository at this point in the history

  7. remove comments from test

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    bd90779 View commit details
    Browse the repository at this point in the history

  8. add test for hist with weights

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    a160bff View commit details
    Browse the repository at this point in the history

  9. fix bad check for storage type

    @lobis
    lobis committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    0bd7de6 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. remove comment

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    af7d023 View commit details
    Browse the repository at this point in the history

  2. add test for hist with(out) weights and labels

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    23a76ea View commit details
    Browse the repository at this point in the history

  3. updated TH1 to_boost to handle weights/labels better

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    7ba24ce View commit details
    Browse the repository at this point in the history

  4. placed histogram to_boost in parent Histogram class to reduce cod… 

    …e duplication
    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    860b6b3 View commit details
    Browse the repository at this point in the history

  5. updated weighted property

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    017cb35 View commit details
    Browse the repository at this point in the history

  6. implemented histogram weighted property in parent Histogram class

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    fc80387 View commit details
    Browse the repository at this point in the history

  7. using weighted property instead of copying check

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    6f50836 View commit details
    Browse the repository at this point in the history

  8. do not use mutable default arguments

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    0fe0c1b View commit details
    Browse the repository at this point in the history

  9. fix calling property

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    ea7fbdd View commit details
    Browse the repository at this point in the history

  10. add missing asserts to test

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    6d43cc7 View commit details
    Browse the repository at this point in the history

  11. add test for issue scikit-hep#722

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    17459cb View commit details
    Browse the repository at this point in the history

  12. add weight test for 2D and 3D histograms

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    d3157bf View commit details
    Browse the repository at this point in the history

  13. add temporary skip to test until file is uploaded

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    99ea10d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into fix-hist-weights

    @lobis
    lobis authored Nov 1, 2022
    Configuration menu
    Copy the full SHA
    43d7c01 View commit details
    Browse the repository at this point in the history

  15. update issue test file

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    aa8c764 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/fix-hist-weights' into fix-hist-… 

    …weights
    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    383eb2c View commit details
    Browse the repository at this point in the history

  17. add back temporary skip until file is available

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    c36ccf3 View commit details
    Browse the repository at this point in the history

  18. Apply suggestions from code review 

    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
Co-authored-by: Angus Hollands <goosey15@gmail.com>
    @lobis @jpivarski @agoose77
    3 people authored Nov 1, 2022
    Configuration menu
    Copy the full SHA
    2aff474 View commit details
    Browse the repository at this point in the history

  19. [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 Nov 1, 2022
    Configuration menu
    Copy the full SHA
    11c14c1 View commit details
    Browse the repository at this point in the history

  20. add suggestion from scikit-hep#774 (comment)

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    7d49e6d View commit details
    Browse the repository at this point in the history

  21. add check for length of fSumw2 greater than 0 so empty histograms a… 

    …re not weighted
    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    6591e5d View commit details
    Browse the repository at this point in the history

  22. remove unnecessary subclass method implementation

    @lobis
    lobis committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    abc2cf5 View commit details
    Browse the repository at this point in the history