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

Avoid forward port #4008 #4107

Merged
merged 31 commits into from Jun 4, 2014
Merged

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Jun 4, 2014

This tells git to ignore any change which might possibly come from merging #4008 into CMSSW_7_0_X.

arizzi and others added 30 commits May 14, 2014 21:44
  * remove r9, sigmaIphiIphi from pat::Electron (in new releases it
    is already in reco::GsfElectron)
  * duplicate the 7.1.X interface of reco::GsfElectron from
    PR cms-sw#3710 for the non-ZS ones, so that the 70X code will
    be forward-compatible with 71X
…nd photons with consistently relinked clusters and conversions
… behaviour of keeping supercluster and seed cluster for all output electrons and photons
…loose matching for reduced conversion collection)
Tested:
1) cmsDriver.py miniAOD_data-prod -s PAT -n 100 --data --filein /store/relval/CMSSW_7_0_0/SingleMu/RECO/GR_R_70_V1_RelVal_zMu2012D-v2/00000/0259E46E-F698-E311-8CFD-003048FF9AC6.root --eventcontent MINIAOD --runUnscheduled --conditions GR_R_70_V1::All --no_exec
2) cmsDriver.py miniAOD-prod -s PAT -n 100 --mc --filein /store/relval/CMSSW_7_0_0/RelValTTbar_13/GEN-SIM-RECO/PU50ns_POSTLS170_V4-v2/00000/265B9219-FF98-E311-BF4A-02163E00EA95.root  --eventcontent MINIAODSIM --runUnscheduled --conditions auto:startup --no_exec

Conflicts:
	PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
(--fast will replace some fastsim-incompatible MET filters with
 dummy boolean filters)
Tested successfully with: cmsDriver RelValTTbar_13-POSTLS170_V3_FastSim-v2 -s PAT -n 10000 --mc --fast --dasquery "file dataset=/RelValTTbar_13/CMSSW_7_0_0-POSTLS170_V3_FastSim-v2/GEN-SIM-DIGI-RECO" --eventcontent MINIAODSIM --runUnscheduled --conditions POSTLS170_V3::All --no_exec
the process.options so not to mix up the allowUntracked
…esn't get added to the jets used for MET systematics (fixes regression after bugfix to to the PAT UserData Merger)
@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 4, 2014

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_1_X IBs unless changes or unless it breaks tests. @nclopezo, @ktf can you please take care of it?

ktf added a commit that referenced this pull request Jun 4, 2014
@ktf ktf merged commit ac2fed3 into cms-sw:CMSSW_7_1_X Jun 4, 2014
@ktf ktf deleted the avoid-forward-port-4008 branch June 4, 2014 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants