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

Merging Colin's 7_4_12 branch into my 74X heppy head #7

Closed
wants to merge 27 commits into from

Conversation

gpetruc
Copy link
Owner

@gpetruc gpetruc commented Jan 7, 2016

@cbernet @arizzi @mariadalfonso
This merges from Colin into CMG, so that the outcome should also be mergeable back in Colin's branch.
Beyond fixing the conflicts, the only two other changes are

  • 97c871f protect the newly-added spring15 ele id so that it doesn't crash on miniaod v1 where it is not available
  • e630adb clean up a bit some jet analyzer things, make it more consistent which collection of jets has id and which not, and make the vhbb-added features configurable.
    Despite this, JetAnalyzer is still a mess, with this infinite combinatoric of multiple jet collections with different selections, ids, and cleaning wrt dfferent objects. We should probably clean it up more and if people need multiple versions of the collections they should just run multiple instances.

cbernet and others added 25 commits September 29, 2015 13:38
@arizzi I merged the PR from CMG, so you can take my heppy_7_4_12 branch and send me a new PR with the commits you were just telling me about. After I have it, I'll port the whole thing to 7_5_X. 
Then, I will do a PR to CMSSW for both 7_4_X and 7_5_X
Thanks, Andrea. I will now have a look at your other PR
Several Jet related fixes and features from VHbb
Conflicts:
	PhysicsTools/Heppy/python/analyzers/objects/autophobj.py
Conflicts:
	PhysicsTools/Heppy/python/analyzers/objects/autophobj.py
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 pushed a commit that referenced this pull request Jan 18, 2016
Herwig++: Create config for CMS tune CUETHppS1
@gpetruc gpetruc closed this Jun 1, 2016
@gpetruc gpetruc deleted the cbernet_7412_mergeable branch June 1, 2016 07:47
gpetruc pushed a commit that referenced this pull request Jan 31, 2017
stopping throws on duplicate superclusters in the event & other debugging info
gpetruc pushed a commit that referenced this pull request Aug 14, 2017
…Update_hPFCalib_fromArun

HLT PF Calibration update compliant with code changes
gpetruc pushed a commit that referenced this pull request Aug 16, 2017
gpetruc pushed a commit that referenced this pull request Aug 16, 2017
…Update_hPFCalib_fromArun (allow empty)

HLT PF Calibration update compliant with code changes
gpetruc pushed a commit that referenced this pull request Feb 15, 2018
use old thresholds when running collapsed 2018
gpetruc pushed a commit that referenced this pull request Oct 29, 2019
include dump bool to do validation
gpetruc pushed a commit that referenced this pull request Jul 15, 2020
…ms (L1Trigger/TrackFindingTMTT) (cms-sw#29381)

* create separate PRs for the two L1TK packages

* Improved KF efficiency at high eta

* Moved MC data files to cms-data

* Removed old file

* Removed KF HLS to put instead in external library

* Ran scram b code-format

* Delete KF4ParamsComb.h.bak

* Delete KF4ParamsCombIV.bak

* Delete KF4ParamsCombV2.bak

* Delete KF5ParamsComb.h.bak

* Delete KF4ParamsComb.cc.bak

* Delete KF4ParamsCombIV.bak

* Delete KF4ParamsCombV2.bak

* Delete KF5ParamsComb.cc.bak

* L1 tk integration tmtt pre5 (#7)

* Added CMS code style fixes

* Removed old file

* Reapplied stub b code-format

* All code review changes (#13)

* Fix clang errors (#14)

* fixed clang error

* directory for MC txt files

* Fixed clang warnings + minor simplifications (#15)

* tweak

* tweak

* Fixed clang warnings and small simplifications

* Fixed clang warnings and small simplifications

* All remaining review comments addressed (#16)

* Replaced vector size with empty function

* Simplified DegradeBend and StubWindowSuggest

* Fixed more review comments

* More review comments

* code reformat

* Ran exhaustive clang tidy

* Added library to BuildFile.xml (#17)

* Deleted TrackFindingTMT/data/README (#18)

* Added library to BuildFile.xml (This was already done yesterday. Not sure why it appears again)

* README file in data directory deleted

* Fix review comments (#20)

Co-authored-by: Louise Skinnari <louise.skinnari@cern.ch>
gpetruc pushed a commit that referenced this pull request Mar 8, 2021
gpetruc pushed a commit that referenced this pull request May 10, 2023
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.

5 participants