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

ROOT 6.22 compatibility (CMSSW 11_2) #648

Merged
merged 21 commits into from
Apr 23, 2021
Merged

ROOT 6.22 compatibility (CMSSW 11_2) #648

merged 21 commits into from
Apr 23, 2021

Commits on Oct 12, 2020

  1. Compiling & running combine against root 622

    @adewit
    adewit committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    6ecc014 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Naming more RooProducts

    @adewit
    adewit committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    3fbd601 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Adding HZZ patch

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

Commits on Feb 19, 2021

  1. ROOT 6.22 compatibility (CMSSW 11_2) 

    Mostly narrowing definitions (ROOT is becoming more precise)
  or header includes that are not for free anymore
  One bug got fixed!
    @nsmith-
    nsmith- committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    b261814 View commit details
    Browse the repository at this point in the history

  2. Check it works in 10_2

    @nsmith-
    nsmith- committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    74f909f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'adewit/standalone-root622' into root6.2… 

    …2-compat
    @nsmith-
    nsmith- committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    be12e11 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'root6.22-compat' of github.com:nsmith-/HiggsAnalysis-Co… 

    …mbinedLimit into root6.22-compat
    @nsmith-
    nsmith- committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    77e8f9a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. feat: add conda based setup

    @andrzejnovak
    andrzejnovak committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    d35b569 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from andrzejnovak/root6.22-compat 

    feat: add conda based setup
    @nsmith-
    nsmith- committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    3f8a55c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. fix: conda env file, README

    @andrzejnovak
    andrzejnovak committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    6dd0ab1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from andrzejnovak/root6.22-compat 

    add conda env sh file and clean up instructions
    @nsmith-
    nsmith- committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    bad1bf4 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Revert "Adding HZZ patch" 

    This reverts commit dd923fc.
    @nsmith-
    nsmith- committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    37541a5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/102x' into root6.22-compat 

    Resolve eigen conflict
    @nsmith-
    nsmith- committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    76b55b7 View commit details
    Browse the repository at this point in the history

  3. Use same arch

    @nsmith-
    nsmith- committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    0932d93 View commit details
    Browse the repository at this point in the history

  4. Actually check it compiles

    @nsmith-
    nsmith- committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b45837c View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. fix: update conda with Eigen (thanks @maxgalli), add frozen env yml (#3)

    @andrzejnovak
    andrzejnovak committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    c7c03c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. Remove 102x compatibility

    @nsmith-
    nsmith- committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    ecfc7ee View commit details
    Browse the repository at this point in the history

  2. Try CI

    @nsmith-
    nsmith- committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    96da9f3 View commit details
    Browse the repository at this point in the history

  3. Make it easier to trigger

    @nsmith-
    nsmith- committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    3e8fa07 View commit details
    Browse the repository at this point in the history

  4. Fix readme

    @nsmith-
    nsmith- committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    2807d25 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. feat: add paths to the conda env (#4) 

    * feat: add paths to the conda env

* chore: update CI build
    @andrzejnovak
    andrzejnovak committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    bb0fedb View commit details
    Browse the repository at this point in the history