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

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) #4207

Merged
merged 17 commits into from Jun 15, 2014
Merged

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) #4207

merged 17 commits into from Jun 15, 2014

Commits on May 23, 2014

  1. Merged refs/pull/3973/head from repository cms-sw

    Giovanni Franzoni committed May 23, 2014
    Copy the full SHA
    8c55f21 View commit details
    Browse the repository at this point in the history

  2. introduced SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixi… 

    …ng wherever needec by premix workflows; TEMPORARY
    Giovanni Franzoni committed May 23, 2014
    Copy the full SHA
    6fbe8b0 View commit details
    Browse the repository at this point in the history

  3. --geometry Extended2015 as needs be in the 70x (all GT-driven in sub… 

    …sequent releases)
    Giovanni Franzoni committed May 23, 2014
    Copy the full SHA
    cd17279 View commit details
    Browse the repository at this point in the history

  4. fix for correct handling of pathological cases of Pt=0 groomed jets

    @ferencek
    ferencek committed May 23, 2014
    Copy the full SHA
    43a944e View commit details
    Browse the repository at this point in the history

  5. process string set to differentiate 25ns/50ns pilep overlaid when don… 

    …e with premixed events
    Giovanni Franzoni committed May 23, 2014
    Copy the full SHA
    163027d View commit details
    Browse the repository at this point in the history

  6. HARVEST in place of HARVESTCOS

    Giovanni Franzoni committed May 23, 2014
    Copy the full SHA
    dee8680 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2014

  1. now discarding matches where two jets are too far apart

    @ferencek
    ferencek committed May 26, 2014
    Copy the full SHA
    3debcce View commit details
    Browse the repository at this point in the history

  2. new premixed dataset as for https://hypernews.cern.ch/HyperNews/CMS/g… 

    …et/relval/2998.html
    Giovanni Franzoni committed May 26, 2014
    Copy the full SHA
    1afa64f View commit details
    Browse the repository at this point in the history

  3. RECOPRMXUP15PROD

    Giovanni Franzoni committed May 26, 2014
    Copy the full SHA
    46dfd10 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2014

  1. prod premix wf's given different label to avoid dataset collision; as… 

    …sure RECO of prod premix workflows use consistent GT
    Giovanni Franzoni committed May 29, 2014
    Copy the full SHA
    3b77d86 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2014

  1. hltGetConfiguration: small clean up in the handling of Services

    @fwyzard
    fwyzard committed Jun 4, 2014
    Copy the full SHA
    48d3265 View commit details
    Browse the repository at this point in the history

  2. hltGetConfiguration: add the "--prescale" option to force using a giv… 

    …en prescale column
    @fwyzard
    fwyzard committed Jun 4, 2014
    Copy the full SHA
    0499b27 View commit details
    Browse the repository at this point in the history

  3. argparse is included in the Python Standard Library since Python 2.7

    @fwyzard
    fwyzard committed Jun 4, 2014
    Copy the full SHA
    7b6b419 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Merge pull request cms-sw#4110 from fwyzard/hltGetConfiguration_clean… 

    …up_70x

hltGetConfiguration cleanup for 7.0.x
    @davidlange6
    davidlange6 committed Jun 10, 2014
    Copy the full SHA
    d27b689 View commit details
    Browse the repository at this point in the history

  2. Merge pull request cms-sw#4001 from franzoni/from-CMSSW_7_0_X_2014-05… 

    …-23-0200-premixPROD2

premix relvals: adapt to fixes of premixing
    @davidlange6
    davidlange6 committed Jun 10, 2014
    Copy the full SHA
    5e8c47d View commit details
    Browse the repository at this point in the history

  3. Merge pull request cms-sw#3996 from cms-btv-pog/JetFlavourClusteringF… 

    …ix_from-CMSSW_7_0_X_2014-05-23-1400

Fix for jet flavour clustering: Backport from 7_1_X to 7_0_X
    @davidlange6
    davidlange6 committed Jun 10, 2014
    Copy the full SHA
    810025a View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

  1. Merge branch 'CMSSW_7_0_X' into CMSSW_7_1_X (fixed conflicts) 

    Conflicts:
	Configuration/PyReleaseValidation/python/relval_steps.py
    @nclopezo
    nclopezo committed Jun 11, 2014
    Copy the full SHA
    7007c2a View commit details
    Browse the repository at this point in the history