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

Second part of miniAOD developments #3545

Merged
merged 17 commits into from May 7, 2014

Conversation

arizzi
Copy link
Contributor

@arizzi arizzi commented Apr 28, 2014

This contains more developments in the context of miniAOD.
@lgray @gpetruc @ferencek

Contains IVF (btag) related code, ecal cluster shape stuff, updated pruned gen particles content.

Similar PR for 70X will follow once #3254 is integrated.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @arizzi for CMSSW_7_1_X.

Second part of miniAOD developments

It involves the following packages:

DataFormats/BTauReco
DataFormats/Candidate
DataFormats/PatCandidates
PhysicsTools/PatAlgos
RecoEcal/EgammaClusterProducers
RecoEcal/EgammaCoreTools

@nclopezo, @monttj, @cmsbuild, @anton-a, @thspeer, @slava77, @vadler, @Degano can you please review it and eventually sign? Thanks.
@TaiSakuma, @lgray, @nhanvtran, @ferencek, @argiro, @pvmulder this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@nclopezo
Copy link
Contributor

Hi @arizzi,

This pull request is not mergeable, could you please rebase it?

@arizzi
Copy link
Contributor Author

arizzi commented Apr 29, 2014

now merged to the current 71X and tested on CMSSW_7_1_X_2014-04-29-0200

@arizzi
Copy link
Contributor Author

arizzi commented Apr 29, 2014

mhh I guess I did not rebase in the proper way... let me try again

@arizzi
Copy link
Contributor Author

arizzi commented Apr 29, 2014

no luck, if I rebase I have to re-resolve all conflicting commits of last two weeks that me and giovanni already resolved in this branch PR.
If I merge myself I get a single merge commit with zillion changes, you can see for example the second last commit of:
arizzi#25

if such commit is not a problem I can update this PR, otherwise someone with better git skills can try to solve it in a better way

@nclopezo
Copy link
Contributor

Hi @arizzi,
I only see conflicts in the file
PhysicsTools/PatAlgos/python/tools/jetTools.py
I did the following:

scram p CMSSW_7_1_X_2014-04-29-0200
cd CMSSW_7_1_X_2014-04-29-0200/
cmsenv
git cms-merge-topic 3545
cd src/
git status

You can follow the instructions in the following link to solve it:
http://cms-sw.github.io/cmssw/tutorial-forward-port.html

@arizzi
Copy link
Contributor Author

arizzi commented Apr 29, 2014

Hi David,
I can merge and solve the conflict but then for some reason that I do not want to understand myself (I wasted already half a day to do so) the resulting commit is not just the jetTools.py fix but rather a largish commit.
Anyhow I do not care if this is not ok, I push the whole thing as you suggested even if the created commit is not minimal.

@cmsbuild
Copy link
Contributor

Pull request #3545 was updated. @nclopezo, @monttj, @cmsbuild, @anton-a, @thspeer, @slava77, @vadler, @Degano can you please check and sign again.

gpetruc added a commit to gpetruc/cmssw that referenced this pull request May 5, 2014
Depends on cms-sw#3545 (queued) and cms-sw#3543 (already merged)
Tested:
1) cmsDriver.py miniAOD_data-prod -s PAT -n 100 --data --filein /store/relval/CMSSW_7_1_0_pre6/JetHT/RECO/PRE_R_71_V2_RelVal_jet2012C-v1/00000/2CBD40F5-E2C7-E311-8206-003048678AC0.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_1_0_pre6/RelValTTbar_13/GEN-SIM-RECO/PRE_LS171_V5-v1/00000/064AD022-51C7-E311-9714-003048679228.root --eventcontent MINIAODSIM --runUnscheduled --conditions auto:startup --no_exec
@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2014

@slava77
Copy link
Contributor

slava77 commented May 7, 2014

testing

@slava77
Copy link
Contributor

slava77 commented May 7, 2014

+1

for #3545 e4b4ea6
tested in CMSSW_7_1_X_2014-05-05-1400 (test area sign368)

  • nominal doubling of the code in EcalClusterTools is not really visible mostly because it's inlined now and not all functions are used
  • there is a minor numerical precision level change in photon sigma_ietaieta plots (fwiw, essentially invisible)

@@ -0,0 +1,81 @@
import FWCore.ParameterSet.Config as cms
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one should go to the tools directory at some point.

@vadler
Copy link

vadler commented May 7, 2014

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented May 7, 2014

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

ktf added a commit that referenced this pull request May 7, 2014
AT AOD -- Second part of miniAOD developments
@ktf ktf merged commit b4f4978 into cms-sw:CMSSW_7_1_X May 7, 2014
gpetruc added a commit to gpetruc/cmssw that referenced this pull request May 8, 2014
Depends on cms-sw#3545 (queued) and cms-sw#3543 (already merged)
Tested:
1) cmsDriver.py miniAOD_data-prod -s PAT -n 100 --data --filein /store/relval/CMSSW_7_1_0_pre6/JetHT/RECO/PRE_R_71_V2_RelVal_jet2012C-v1/00000/2CBD40F5-E2C7-E311-8206-003048678AC0.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_1_0_pre6/RelValTTbar_13/GEN-SIM-RECO/PRE_LS171_V5-v1/00000/064AD022-51C7-E311-9714-003048679228.root --eventcontent MINIAODSIM --runUnscheduled --conditions auto:startup --no_exec
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