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

CMGTools Heppy 7_4_12 (end of 2015 version) #64

Merged
merged 69 commits into from
Jan 8, 2016

Conversation

gpetruc
Copy link

@gpetruc gpetruc commented Jan 7, 2016

Pull request of all CMG code to upstream Heppy, after merging the upstream heppy into the CMG heppy first to solve the conflict ( the reverse diff between the upstream heppy and the CMG is gpetruc#7 )

@arizzi @mariadalfonso

gpetruc and others added 30 commits September 22, 2015 14:17
Conflicts:
	PhysicsTools/HeppyCore/scripts/heppy_batch.py
… for jets failing id (in synch. with SnT), plus added zllmt_* variables and activity anulus for leptons and isotracks (to be synchronized with SnT)
Heppy: add Flag_HBHENoiseIsoFilter to trigger bits in heppy
Conflicts:
	PhysicsTools/Heppy/python/physicsobjects/Electron.py
gpetruc and others added 20 commits January 4, 2016 14:09
… just in the code; put better defaults for prescaleProcessName
changed medium Muon-ID definition to be in line with CMSSW selector.
segmentCompatibility of inner track goes from >=0.8 to >0.8.
THIS WILL CHANGE YOUR MUONS! BE CAREFUL ON IMPLEMENTATION!!!
Heppy: sync medium muon id definition with CMSSW implementation
HeppyCore heppy_loop: pass parser to main function (needed for error printout)
…_final

Conflicts:
	PhysicsTools/Heppy/python/analyzers/objects/JetAnalyzer.py
	PhysicsTools/Heppy/python/analyzers/objects/METAnalyzer.py
- discardedJets are made from jets, while noIdDiscardedJets from jetsAllNoID
- remove commented out parts
- don't apply jetEta cut to jetsAllNoID a second time before cleaning,
  since it has been applied already within testJetNoID before
- make the attaching of neutrinos optional
  ( attachNeutrinos boolean parameter )
- make the overlap calculation via pfcandidates optional
  ( checkLeptonPFOverlap boolean )
… 74Xv1 miniAODS (if old74XMiniAODs is set to True), and make adding shifts optional (makeShiftedMETs)
@gpetruc
Copy link
Author

gpetruc commented Jan 7, 2016

Updated with fixes to the pileup analyzer (98deeb1) and to the MET shifts on old 74X miniAOD (6d3c81c, which also saves the shifted mets by name and not just by integer enum key)

cbernet added a commit that referenced this pull request Jan 8, 2016
Thank you, Giovanni. It looks good to me at first sight. I'll do basic tests this morning and will let you know.
@cbernet cbernet merged commit 183df85 into cbernet:heppy_7_4_12 Jan 8, 2016
@cbernet
Copy link
Owner

cbernet commented Jan 8, 2016

All basic tests are passing.

@arizzi would you prefer to test that everything is fine on the VHbb side on this branch before I port these modifications to 763?
https://github.com/cbernet/cmssw/tree/heppy_7_4_12

Or is it easier for you to do tests in 763 after the port?

The thing is that the port from 74X to 76X is quite difficult and error-prone... So after I do the port of CMG's modifications, I'd prefer to close heppy_7_4_12 if possible. Let me both know if this could be a problem for you, and what are your plans concerning developments for 7_4_X.

Cheers,
Colin

@arizzi
Copy link

arizzi commented Jan 8, 2016

please go straight to 763, we will start from there and send further PR directly on 76X

@arizzi
Copy link

arizzi commented Jan 8, 2016

please let us know once the 76X branch is updated with this

@gpetruc gpetruc deleted the cbernet_7412_mergeable branch June 1, 2016 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants