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

Add subjets to softdrop #6817

Merged
merged 10 commits into from Dec 10, 2014
Merged

Add subjets to softdrop #6817

merged 10 commits into from Dec 10, 2014

Commits on Dec 3, 2014

  1. Configuration menu
    Copy the full SHA
    d6222aa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9fbc80a View commit details
    Browse the repository at this point in the history
  3. remove duplicate line

    ahinzmann committed Dec 3, 2014
    Configuration menu
    Copy the full SHA
    edc1a2f View commit details
    Browse the repository at this point in the history
  4. fix to subjets in softdrop

    ahinzmann committed Dec 3, 2014
    Configuration menu
    Copy the full SHA
    67a664a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1e04e02 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dcde7d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. calculate subjets for softdrop

    Conflicts:
    	RecoJets/JetProducers/python/ak4PFJetsSoftDrop_cfi.py
    ahinzmann committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    94218b8 View commit details
    Browse the repository at this point in the history
  2. add subjets to ak5 softdrop

    Conflicts:
    	RecoJets/JetProducers/python/ak5PFJetsSoftDrop_cfi.py
    ahinzmann committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    aaa7b64 View commit details
    Browse the repository at this point in the history
  3. resolve merge conflict

    ahinzmann committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    266b640 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5c83701 View commit details
    Browse the repository at this point in the history