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
Deep flavour PR #17247
Merged
cmsbuild
merged 23 commits into
cms-sw:CMSSW_9_0_X
from
mverzett:DeepFlavourPR-from-CMSSW_9_0_X
Feb 9, 2017
Merged
Deep flavour PR #17247
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
a13ab73
Added DeepFlavour deep NN b-tagger. Added its (generic) TagInfo DataF…
bddb994
added tagging variable to the list. Finalized TaggingVariableList in …
7229739
added missing tagging variables for DeepFlavour to work, fix inconsis…
ce93d7c
fix input tags when running with label/postfix
75b2702
jets with no tracks get assigned -1 by default
4e4c710
added script to move from the training json format to the CMSSW compa…
7d07583
fix DeepNN positive tagger
f9c078b
bugfix on negative tags
6b86b17
cMVA work in progress
8b0ea83
Working CMVA with some problems still to be solved
a02ac67
fixed inf values of SoftLeptonTaggers
416cfcc
Fixed J(B)P and SoftMu(El) values
8cd4845
fixing some defaults and cleaning stuff
d0c66f8
configure parameter on pT threshold to default JP and SL taggers
8f2a037
small bugfix in postive deepCMVA tagger
3b2640e
Move code from RecoBTag/DeepFlavour to RecoBTag/Combined, cleanup, re…
2ca44a7
added DeepCSV testing file to help fix mutex error
ccbc5bb
Work in progress, fix segfault when making ShallowTagInfo persistent
9040185
changed tagger names to be compliant with naming convention
c98d16a
fix indentation
9c21597
implemented PR #17247 comments
898bb41
fix final inconsistencies
6f1e3b6
add description to added tagInfo
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#ifndef DataFormats_BTauReco_ShallowTagInfo_h | ||
#define DataFormats_BTauReco_ShallowTagInfo_h | ||
|
||
#include "DataFormats/BTauReco/interface/RefMacros.h" | ||
#include "DataFormats/BTauReco/interface/BaseTagInfo.h" | ||
#include "DataFormats/BTauReco/interface/CandIPTagInfo.h" | ||
#include "DataFormats/BTauReco/interface/CandSecondaryVertexTagInfo.h" | ||
#include "DataFormats/BTauReco/interface/TaggingVariable.h" | ||
|
||
namespace reco { | ||
|
||
class ShallowTagInfo : public BaseTagInfo { | ||
public: | ||
ShallowTagInfo(void) { } | ||
|
||
ShallowTagInfo( | ||
const TaggingVariableList & list, | ||
const edm::RefToBase<Jet> & jetref) : | ||
list_(list), | ||
jetRef_(jetref) { } | ||
|
||
virtual ~ShallowTagInfo(void) { } | ||
|
||
virtual ShallowTagInfo* clone(void) const { return new ShallowTagInfo(*this); } | ||
|
||
virtual edm::RefToBase<Jet> jet(void) const { return jetRef_; } | ||
|
||
virtual TaggingVariableList taggingVariables(void) const { return list_; } | ||
|
||
protected: | ||
/*const*/ TaggingVariableList list_; | ||
/*const*/ edm::RefToBase<Jet> jetRef_; | ||
}; | ||
|
||
DECLARE_EDM_REFS( ShallowTagInfo ) | ||
|
||
} | ||
|
||
#endif // DataFormats_BTauReco_ShallowTagInfo_h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,21 @@ | |
cms.InputTag("pfCombinedMVAV2BJetTags"), | ||
# CTagging | ||
cms.InputTag('pfCombinedCvsLJetTags'), | ||
cms.InputTag('pfCombinedCvsBJetTags') | ||
cms.InputTag('pfCombinedCvsBJetTags'), | ||
# The following code is commented-out to avoid breaking any unit test | ||
# waiting for a set of AOD RelVals which have the jet tags in the event content | ||
# DeepFlavour | ||
# cms.InputTag('pfDeepCSVJetTags:probb'), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is this commented out code needed? [I can guess that we need to wait for a reference release inputs to be able to pass the PAT unit tests] |
||
# cms.InputTag('pfDeepCSVJetTags:probc'), | ||
# cms.InputTag('pfDeepCSVJetTags:probudsg'), | ||
# cms.InputTag('pfDeepCSVJetTags:probbb'), | ||
# cms.InputTag('pfDeepCSVJetTags:probcc'), | ||
# DeepCMVA | ||
# cms.InputTag('pfDeepCMVAJetTags:probb'), | ||
# cms.InputTag('pfDeepCMVAJetTags:probc'), | ||
# cms.InputTag('pfDeepCMVAJetTags:probudsg'), | ||
# cms.InputTag('pfDeepCMVAJetTags:probbb'), | ||
# cms.InputTag('pfDeepCMVAJetTags:probcc'), | ||
), | ||
# clone tag infos ATTENTION: these take lots of space! | ||
# usually the discriminators from the default algos | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't find descriptions for the new Jet_ variables
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slava77 What do you mean? The descriptions are in the right handside in the strings.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment is for the TaggingVariableDescription array above. There is no description for , e.g.
Jet_SoftMu which should be right below z_ratio on L135
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May I suggest to enter at least some dummy values in TaggingVariableDescription
https://github.com/cms-sw/cmssw/pull/17247/files#diff-89cfcec978581c291c1e7822bb06e964R137
I don't care as much about the content of the description. The problem is that there are no values set,
which can lead to crashes if there is some code using descriptions for printouts or something.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slava77 I know see what you mean. I fixed it.