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.

Sign up for GitHub

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

Jump to bottom

New mva taggers backport from 71X to 53X #3795

Merged
merged 12 commits into from Jun 3, 2014
Merged

New mva taggers backport from 71X to 53X #3795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
046fda3
added new tagging variables and new version of CombinedSVComputer
pvmulder Dec 17, 2013
b197174
minor fixes
pvmulder Feb 11, 2014
8530842
combined CSVV2+SL tagger
pvmulder Feb 24, 2014
d26c513
changes needed or combined CSVV2_SL tagger
pvmulder Feb 24, 2014
66a9cee
if-else instead of ifs and removing the unneeded exception
pvmulder Mar 3, 2014
d933e0e
use selectedTracks, trackQuality 'any', define trackJetPt, use std::c…
pvmulder Apr 17, 2014
e181347
updated definition of track-based pt
pvmulder May 5, 2014
6e28b7f
fix double usage of seeding track
arizzi May 7, 2014
abcdd11
modify configuration files in such a way that standard CSV is not aff…
pvmulder May 9, 2014
a4a4ac4
less error-prone implementation
pvmulder May 9, 2014
588a0fc
alignment fixed
pvmulder May 9, 2014
747c8fb
redefine var.multiplicity = 0
pvmulder May 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 31 additions & 11 deletions DataFormats/BTauReco/interface/TaggingVariable.h
View file
Open in desktop
Expand Up @@ -44,14 +44,15 @@ namespace reco {
trackDecayLenSig, // track decay length significance
trackJetDistVal, // minimum track approach distance to jet axis
trackJetDistSig, // minimum track approach distance to jet axis significance
trackGhostTrackDistVal, // minimum approach distance to ghost track
trackGhostTrackDistSig, // minimum approach distance to ghost track significance
trackGhostTrackWeight, // weight of track participation in ghost track fit
trackGhostTrackDistVal, // minimum approach distance to ghost track
trackGhostTrackDistSig, // minimum approach distance to ghost track significance
trackGhostTrackWeight, // weight of track participation in ghost track fit

trackSumJetEtRatio, // ratio of track sum transverse energy over jet energy
trackSumJetDeltaR, // pseudoangular distance between jet axis and track fourvector sum

vertexCategory, // category of secondary vertex (Reco, Pseudo, No)
vertexLeptonCategory, // category of secondary vertex & soft lepton (RecoNo, PseudoNo, NoNo, RecoMu, PseudoMu, NoMu, RecoEl, PseudoEl, NoEl)

jetNSecondaryVertices, // number of reconstructed possible secondary vertices in jet
jetNSingleTrackVertices, // number of single-track ghost-track vertices
Expand All @@ -73,22 +74,41 @@ namespace reco {
trackSip3dValAboveCharm, // track 3D signed impact parameter of first track lifting mass above charm
trackSip3dSigAboveCharm, // track 3D signed impact parameter significance of first track lifting mass above charm

neutralEnergy, // neutral ECAL clus. energy sum
neutralEnergyOverCombinedEnergy, // neutral ECAL clus. energy sum/(neutral ECAL clus. energy sum + pion tracks energy)
neutralIsolEnergy, // neutral ECAL clus. energy sum in isolation band
neutralIsolEnergyOverCombinedEnergy, // neutral ECAL clus. energy sum in isolation band/(neutral ECAL clus. energy sum + pion tracks energy)
neutralEnergyRatio, // ratio of neutral ECAL clus. energy sum in isolation band over neutral ECAL clus. energy sum
neutralclusterNumber, // number of neutral ECAL clus.
neutralclusterRadius, // mean DR between neutral ECAL clus. and lead.track

leptonQuality, // lepton identification quality
leptonQuality2, // lepton identification quality 2

trackP0Par, // track momentum along the jet axis, in the jet rest frame
trackP0ParRatio, // track momentum along the jet axis, in the jet rest frame, normalized to its energy"
trackChi2, // track fit chi2
trackNTotalHits, // number of valid total hits
trackNPixelHits, // number of valid pixel hits

chargedHadronEnergyFraction, // fraction of the jet energy coming from charged hadrons
neutralHadronEnergyFraction, // fraction of the jet energy coming from neutral hadrons
photonEnergyFraction, // fraction of the jet energy coming from photons
electronEnergyFraction, // fraction of the jet energy coming from electrons
muonEnergyFraction, // fraction of the jet energy coming from muons
chargedHadronMultiplicity, // number of charged hadrons in the jet
neutralHadronMultiplicity, // number of neutral hadrons in the jet
photonMultiplicity, // number of photons in the jet
electronMultiplicity, // number of electrons in the jet
muonMultiplicity, // number of muons in the jet
hadronMultiplicity, // sum of number of charged and neutral hadrons in the jet
hadronPhotonMultiplicity, // sum of number of charged and neutral hadrons and photons in the jet
totalMultiplicity, // sum of number of charged and neutral hadrons, photons, electrons and muons in the jet

massVertexEnergyFraction, // vertexmass times fraction of the vertex energy w.r.t. the jet energy
vertexBoostOverSqrtJetPt, // variable related to the boost of the vertex system in flight direction

leptonSip2d, // 2D signed impact parameter of the soft lepton
leptonSip3d, // 3D signed impact parameter of the soft lepton
leptonPtRel, // transverse momentum of the soft lepton wrt. the jet axis
leptonP0Par, // momentum of the soft lepton along the jet direction, in the jet rest frame
leptonEtaRel, // pseudo)rapidity of the soft lepton along jet axis
leptonDeltaR, // pseudo)angular distance of the soft lepton to jet axis
leptonRatio, // momentum of the soft lepton over jet energy
leptonRatioRel, // momentum of the soft lepton parallel to jet axis over jet energy

algoDiscriminator, // discriminator output of an algorithm

lastTaggingVariable
Expand Down
93 changes: 67 additions & 26 deletions DataFormats/BTauReco/src/TaggingVariable.cc
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@ const char* TaggingVariableDescription[] = {
/* [trackSumJetDeltaR] = */ "pseudoangular distance between jet axis and track fourvector sum",

/* [vertexCategory] = */ "category of secondary vertex (Reco, Pseudo, No)",
/* [vertexLeptonCategory] = */ "category of secondary vertex & soft lepton (RecoNo, PseudoNo, NoNo, RecoMu, PseudoMu, NoMu, RecoEl, PseudoEl, NoEl)",

/* [jetNSecondaryVertices] = */ "number of reconstructed possible secondary vertices in jet",
/* [jetNSingleTrackVertices] = */ "number of single-track ghost-track vertices",
Expand All @@ -65,23 +66,42 @@ const char* TaggingVariableDescription[] = {
/* [trackSip3dValAboveCharm] = */ "track 3D signed impact parameter of first track lifting mass above charm",
/* [trackSip3dSigAboveCharm] = */ "track 3D signed impact parameter significance of first track lifting mass above charm",

/* [neutralEnergy] = */ "neutral ECAL clus. energy sum",
/* [neutralEnergyOverCombinedEnergy] = */ "neutral ECAL clus. energy sum/(neutral ECAL clus. energy sum + pion tracks energy)",
/* [neutralIsolEnergy] = */ "neutral ECAL clus. energy sum in isolation band",
/* [neutralIsolEnergyOverCombinedEnergy] = */ "neutral ECAL clus. energy sum in isolation band/(neutral ECAL clus. energy sum + pion tracks energy)",
/* [neutralEnergyRatio] = */ "ratio of neutral ECAL clus. energy sum in isolation band over neutral ECAL clus. energy sum",
/* [neutralclusterNumber] = */ "number of neutral ECAL clus.",
/* [neutralclusterRadius] = */ "mean DR between neutral ECAL clus. and lead.track",

/* [leptonQuality] = */ "lepton identification quality",
/* [leptonQuality2] = */ "lepton identification quality 2",
/* [trackP0Par] = */ "track momentum along the jet axis, in the jet rest frame",
/* [trackP0ParRatio] = */ "track momentum along the jet axis, in the jet rest frame, normalized to its energy"
/* [trackChi2] = */ "chi2 of the track fit",
/* [trackNTotalHits], = */ "number of valid total hits",
/* [trackNPixelHits], = */ "number of valid pixel hits",
/* [trackNTotalHits] = */ "number of valid total hits",
/* [trackNPixelHits] = */ "number of valid pixel hits",

/* [algoDiscriminator], = */ "discriminator output of an algorithm",
/* [leptonQuality] = */ "lepton identification quality",
/* [leptonQuality2] = */ "lepton identification quality 2",

/* [chargedHadronEnergyFraction] = */ "fraction of the jet energy coming from charged hadrons",
/* [neutralHadronEnergyFraction] = */ "fraction of the jet energy coming from neutral hadrons",
/* [photonEnergyFraction] = */ "fraction of the jet energy coming from photons",
/* [electronEnergyFraction] = */ "fraction of the jet energy coming from electrons",
/* [muonEnergyFraction] = */ "fraction of the jet energy coming from muons",
/* [chargedHadronMultiplicity] = */ "number of charged hadrons in the jet",
/* [neutralHadronMultiplicity] = */ "number of neutral hadrons in the jet",
/* [photonMultiplicity] = */ "number of photons in the jet",
/* [electronMultiplicity] = */ "number of electrons in the jet",
/* [muonMultiplicity] = */ "number of muons in the jet",
/* [hadronMultiplicity] = */ "total number of charged and neutral hadrons in the jet",
/* [hadronPhotonMultiplicity] = */ "total number of photons, charged and neutral hadrons in the jet",
/* [totalMultiplicity] = */ "total number of photons, electrons, muons, charged and neutral hadrons in the jet",

/* [massVertexEnergyFraction] = */ "vertexmass times fraction of the vertex energy w.r.t. the jet energy",
/* [vertexBoostOverSqrtJetPt] = */ "variable related to the boost of the vertex system in flight direction",

/* [leptonSip2d] = */ "2D signed impact parameter of the soft lepton",
/* [leptonSip3d] = */ "3D signed impact parameter of the soft lepton",
/* [leptonPtRel] = */ "transverse momentum of the soft lepton wrt. the jet axis",
/* [leptonP0Par] = */ "momentum of the soft lepton along the jet direction, in the jet rest frame",
/* [leptonEtaRel] = */ "pseudo)rapidity of the soft lepton along jet axis",
/* [leptonDeltaR] = */ "pseudo)angular distance of the soft lepton to jet axis",
/* [leptonRatio], = */ "momentum of the soft lepton over jet energy",
/* [leptonRatioRel] = */ "momentum of the soft lepton parallel to jet axis over jet energy",

/* [algoDiscriminator] = */ "discriminator output of an algorithm",

/* [lastTaggingVariable] = */ ""
};
Expand Down Expand Up @@ -112,7 +132,7 @@ const char* TaggingVariableTokens[] = {
/* [trackSip3dSig] = */ "trackSip3dSig",
/* [trackDecayLenVal] = */ "trackDecayLenVal",
/* [trackDecayLenSig] = */ "trackDecayLenSig",
/* [trackJetDistVal] = */ "trackJetDist", //FIXME
/* [trackJetDistVal] = */ "trackJetDist", //FIXME
/* [trackJetDistSig] = */ "trackJetDistSig",
/* [trackGhostTrackDistVal] = */ "trackGhostTrackDistVal",
/* [trackGhostTrackDistSig] = */ "trackGhostTrackDistSig",
Expand All @@ -122,6 +142,7 @@ const char* TaggingVariableTokens[] = {
/* [trackSumJetDeltaR] = */ "trackSumJetDeltaR",

/* [vertexCategory] = */ "vertexCategory",
/* [vertexLeptonCategory] = */ "vertexLeptonCategory",

/* [jetNSecondaryVertices] = */ "jetNSecondaryVertices",
/* [jetNSingleTrackVertices] = */ "jetNSingleTrackVertices",
Expand All @@ -143,23 +164,43 @@ const char* TaggingVariableTokens[] = {
/* [trackSip3dValAboveCharm] = */ "trackSip3dValAboveCharm",
/* [trackSip3dSigAboveCharm] = */ "trackSip3dSigAboveCharm",

/* [neutralEnergy] = */ "neutralEnergy",
/* [neutralEnergyOverCombinedEnergy] = */ "neutralEnergyOverCombinedEnergy",
/* [neutralIsolEnergy] = */ "neutralIsolEnergy",
/* [neutralIsolEnergyOverCombinedEnergy] = */ "neutralIsolEnergyOverCombinedEnergy",
/* [neutralEnergyRatio] = */ "neutralEnergyRatio",
/* [neutralclusterNumber] = */ "neutralclusterNumber",
/* [neutralclusterRadius] = */ "neutralclusterRadius",

/* [leptonQuality] = */ "leptonQuality",
/* [leptonQuality2] = */ "leptonQuality2",

/* [trackP0Par] = */ "trackP0Par",
/* [trackP0ParRatio] = */ "trackP0ParRatio",
/* [trackChi2] = */ "trackChi2",
/* [trackNTotalHits], = */ "trackNTotalHits",
/* [trackNPixelHits], = */ "trackNPixelHits",

/* [algoDiscriminator], = */ "algoDiscriminator",
/* [trackNTotalHits] = */ "trackNTotalHits",
/* [trackNPixelHits] = */ "trackNPixelHits",


/* [chargedHadronEnergyFraction] = */ "chargedHadronEnergyFraction",
/* [neutralHadronEnergyFraction] = */ "neutralHadronEnergyFraction",
/* [photonEnergyFraction] = */ "photonEnergyFraction",
/* [electronEnergyFraction] = */ "electronEnergyFraction",
/* [muonEnergyFraction], = */ "muonEnergyFraction",
/* [chargedHadronMultiplicity], = */ "chargedHadronMultiplicity",
/* [neutralHadronMultiplicity], = */ "neutralHadronMultiplicity",
/* [photonMultiplicity] = */ "photonMultiplicity",
/* [electronMultiplicity] = */ "electronMultiplicity",
/* [muonMultiplicity], = */ "muonMultiplicity",
/* [hadronMultiplicity], = */ "hadronMultiplicity",
/* [hadronPhotonMultiplicity], = */ "hadronPhotonMultiplicity",
/* [totalMultiplicity] = */ "totalMultiplicity",

/* [massVertexEnergyFraction], = */ "massVertexEnergyFraction",
/* [vertexBoostOverSqrtJetPt], = */ "vertexBoostOverSqrtJetPt",

/* [leptonSip2d] = */ "leptonSip2d",
/* [leptonSip3d] = */ "leptonSip3d",
/* [leptonPtRel] = */ "leptonPtRel",
/* [leptonP0Par] = */ "leptonP0Par",
/* [leptonEtaRel] = */ "leptonEtaRel",
/* [leptonDeltaR] = */ "leptonDeltaR",
/* [leptonRatio] = */ "leptonRatio",
/* [leptonRatioRel], = */ "leptonRatioRel",

/* [algoDiscriminator] = */ "algoDiscriminator",

/* [lastTaggingVariable] = */ "lastTaggingVariable"
};
Expand Down
26 changes: 14 additions & 12 deletions PhysicsTools/MVAComputer/src/MVAComputer.cc
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
// #define DEBUG_EVAL

#ifdef DEBUG_EVAL
# include <Reflex/Tools.h>
#include "FWCore/Utilities/interface/TypeDemangler.h"
#endif

#define STANDALONE_HEADER "MVAComputer calibration\n"
Expand Down Expand Up @@ -62,6 +62,7 @@ MVAComputer::MVAComputer(std::istream &is) :

void MVAComputer::setup(const Calibration::MVAComputer *calib)
{

nVars = calib->inputSet.size();
output = calib->output;

Expand Down Expand Up @@ -121,21 +122,21 @@ void MVAComputer::setup(const Calibration::MVAComputer *calib)

std::set<InputVar> variables;
unsigned int i = 0;
for(std::vector<Calibration::Variable>::const_iterator iter =
calib->inputSet.begin(); iter != calib->inputSet.end();
++iter, i++) {
for(std::vector<Calibration::Variable>::const_iterator iter = calib->inputSet.begin(); iter != calib->inputSet.end(); ++iter, i++) {
InputVar var;
var.var = Variable(iter->name, config[i].mask);
var.index = i;
var.multiplicity = 0;
variables.insert(var);
}

inputVariables.resize(i);
std::copy(variables.begin(), variables.end(),
inputVariables.begin());

std::copy(variables.begin(), variables.end(), inputVariables.begin());

for(unsigned int j = 0; j < i; j++)
inputVariables[j].multiplicity = config[j].origin;
inputVariables[j].multiplicity = config[j].origin;

}

MVAComputer::~MVAComputer()
Expand All @@ -144,9 +145,8 @@ MVAComputer::~MVAComputer()

unsigned int MVAComputer::getVariableId(AtomicId name) const
{
std::vector<InputVar>::const_iterator pos =
std::lower_bound(inputVariables.begin(), inputVariables.end(),
name);

std::vector<InputVar>::const_iterator pos = std::lower_bound(inputVariables.begin(), inputVariables.end(), name);

if (pos == inputVariables.end() || pos->var.getName() != name)
throw cms::Exception("InvalidVariable")
Expand All @@ -159,6 +159,7 @@ unsigned int MVAComputer::getVariableId(AtomicId name) const
template<class T>
void MVAComputer::evalInternal(T &ctx) const
{

double *output = ctx.values() + ctx.n();
int *outConf = ctx.conf() + inputVariables.size();

Expand Down Expand Up @@ -186,8 +187,9 @@ void MVAComputer::evalInternal(T &ctx) const
? next->nOutput : 0;

#ifdef DEBUG_EVAL
std::cout << ROOT::Reflex::Tools::Demangle(
typeid(*iter->processor)) << std::endl;
std::string demangledName;
edm::typeDemangle(typeid(*iter->processor).name(), demangledName);
std::cout << demangledName << std::endl;
#endif
if (status != VarProcessor::kSkip)
ctx.eval(&*iter->processor, outConf, output,
Expand Down
1 change: 1 addition & 0 deletions RecoBTag/SecondaryVertex/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
<use name="DataFormats/BTauReco"/>
<use name="DataFormats/PatCandidates"/>
<use name="rootmath"/>
<export>
<lib name="1"/>
Expand Down