Commit 1b50f27e authored by Emmanuel Le Guirriec's avatar Emmanuel Le Guirriec Committed by Graeme Stewart
Browse files

update JetVertexCharge to PUB note (BTagging-00-07-47)

	* update JetVertexCharge to PUB note / BTagCalibRUN12-08-08 tag status
	* tagged as BTagging-00-07-47

2015-09-03 Frank Filthaut
	* update JetVertexCharge to PUB note / BTagCalibRUN12-08-08 tag status

2015-09-01 Emmanuel Le Guirriec
	* Enable MVb (MV2c10b) and JetVertexCharge
	* tagged as BTagging-00-07-46

2015-08-31 Emmanuel Le Guirriec
        * clean StandAloneJetBTaggerAlg.cxx following BTagging-00-07-43
	changes (commented old code and one JetContainer retrieval deleted)
	* tagged as BTagging-00-07-45

2015-08-31 Jan Kuechler
	* move BTaggingConfiguration_MVbTag.py to use the MV2Tag.cxx algorithm
	* tag as BTagging-00-07-44

2015-07-16 Frank Filthaut
...
(Long ChangeLog diff - truncated)
parent 76257216
......@@ -49,9 +49,16 @@ class JetBTaggerTool:
ToolHandle< IBTagTrackAssociation > m_BTagTrackAssocTool;
ToolHandle< IBTagSecVertexing > m_bTagSecVtxTool;
ToolHandle< IBTagJetPtScaling> m_PtRescalingTool;
mutable bool m_retag;
bool m_augment;
bool m_PtRescale;
ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
// Utility functions to be used in case of container overwriting.
// Note that they do not need to be defined here, as they can only be called from code in JetBTaggerTool.cxx.
template< class CONTAINER, class AUXSTORE >
StatusCode overwrite(const std::string& key, bool doCopy = true) const;
template< class CONTAINER, class AUXSTORE >
StatusCode overwriteImp(const std::string& key, bool doCopy = true) const;
};
}
......
......@@ -34,8 +34,14 @@ class StandAloneJetBTaggerAlg:
private:
std::string m_JetCollectionName;
std::string m_suffix;
ToolHandle< IJetBTaggerTool > m_JetBTaggerTool;
// Utility function to be used in case of container overwriting.
// Note that it do not need to be defined here, as it can only be called from code in StandAloneJetBTaggerAlg.cxx.
template< class CONTAINER, class AUXSTORE >
StatusCode overwrite(const std::string& key) const;
};
}
......
......@@ -13,6 +13,7 @@ use JetInterface JetInterface-* Reconstruction/Jet
use AsgTools AsgTools-* Control/AthToolSupport
use xAODTracking xAODTracking-* Event/xAOD
use MagFieldInterfaces MagFieldInterfaces-* MagneticField
private
#use AtlasCLHEP AtlasCLHEP-* External
......@@ -22,6 +23,7 @@ use xAODBase xAODBase-* Event/xAOD
use xAODCore xAODCore-* Event/xAOD
use xAODTracking xAODTracking-* Event/xAOD
use Particle Particle-* Reconstruction
use xAODMuon xAODMuon-* Event/xAOD
use JetTagEvent JetTagEvent-* PhysicsAnalysis/JetTagging
use JetTagInfo JetTagInfo-* PhysicsAnalysis/JetTagging
......
......@@ -38,7 +38,7 @@ metathisBTagLabeling = { 'OneInTotal' : True,
} }
def toolthisBTagLabeling(name, useBTagFlagsDefaults = True, **options):
"""Sets up a TrackToVertexIPEstimator tool and returns it.
"""Sets up a BTagLabeling tool and returns it.
The following options have BTaggingFlags defaults:
......@@ -57,7 +57,7 @@ def toolthisBTagLabeling(name, useBTagFlagsDefaults = True, **options):
metaBTagJetTruthMatching = { 'OneInTotal' : True }
def toolBTagJetTruthMatching(name, useBTagFlagsDefaults = True, **options):
"""Sets up a TrackToVertexIPEstimator tool and returns it. There are actually two
"""Sets up a BTagJetTruthMatching( tool and returns it. There are actually two
incarnations of this tool, toolJetQuarkLabel or tooltoolJetTrackTruthMatching depending
on the options. The relevant option is 'subtype'.
......
......@@ -3,6 +3,8 @@
# Configuration functions for IP2DNegTag
# Author: Wouter van den Wollenberg (2013-2014)
from BTagging.BTaggingFlags import BTaggingFlags
from AtlasGeoModel.InDetGMJobProperties import GeometryFlags as geoFlags
btagrun1 = (geoFlags.Run() == "RUN1" or (geoFlags.Run() == "UNDEFINED" and geoFlags.isIBL() == False))
metaIP2DNegTag = { 'IsATagger' : True,
'xAODBaseName' : 'IP2DNeg',
......@@ -46,17 +48,26 @@ def toolIP2DNegTag(name, useBTagFlagsDefaults = True, **options):
flipIPSign default: True
usePosIP default: True
useNegIP default: False
UseCHypo default: True
SecVxFinderName default: "SV1"
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
if useBTagFlagsDefaults:
grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
"0HitInExp", "0HitIn",
"0HitNInExp", "0HitNIn",
"InANDNInShared", "PixShared", "SctShared",
"InANDNInSplit", "PixSplit",
"Good"]
if btagrun1: grades=[ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ]
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'referenceType' : BTaggingFlags.ReferenceType,
'impactParameterView' : '2D',
'trackGradePartitions' : [ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ],
'trackGradePartitions' : grades,
'RejectBadTracks' : False,
'originalTPCollectionName' : BTaggingFlags.TrackParticleCollectionName,
'jetCollectionList' : BTaggingFlags.Jets,
......@@ -64,6 +75,8 @@ def toolIP2DNegTag(name, useBTagFlagsDefaults = True, **options):
'flipIPSign' : True,
'usePosIP' : True,
'useNegIP' : False,
'UseCHypo' : True,
'SecVxFinderName' : 'SV1',
}
for option in defaults:
options.setdefault(option, defaults[option])
......@@ -85,7 +98,6 @@ def toolIP2DNegDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **op
useDetailSharedHitInfo default: True
useRun2TrackGrading default: False
hitBLayerGrade default: True
hitInnerLayersGrade default: True
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -96,9 +108,10 @@ def toolIP2DNegDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **op
# 'TrackSummaryTool' : None,
'useSharedHitInfo' : True,
'useDetailSharedHitInfo' : True,
'useRun2TrackGrading' : False,
'useRun2TrackGrading' : (btagrun1 == False),
'useInnerLayers0HitInfo' : (btagrun1 == False),
'useDetailSplitHitInfo' : (btagrun1 == False),
'hitBLayerGrade' : True,
'hitInnerLayersGrade' : True,
}
for option in defaults:
options.setdefault(option, defaults[option])
......@@ -169,6 +182,7 @@ def toolIP2DNegTrackSelector(name, useBTagFlagsDefaults = True, **options):
OutputLevel default: BTaggingFlags.OutputLevel
useBLayerHitPrediction default: True
usepTDepTrackSel default: False
nHitBLayer default: 0
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -177,6 +191,7 @@ def toolIP2DNegTrackSelector(name, useBTagFlagsDefaults = True, **options):
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'useBLayerHitPrediction' : True,
'nHitBLayer' : 0,
'usepTDepTrackSel' : False }
for option in defaults:
options.setdefault(option, defaults[option])
......
......@@ -63,6 +63,7 @@ def toolIP2DTag(name, useBTagFlagsDefaults = True, **options):
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'referenceType' : BTaggingFlags.ReferenceType,
'jetPtMinRef' : BTaggingFlags.JetPtMinRef,
'impactParameterView' : '2D',
'trackGradePartitions' : grades,
'RejectBadTracks' : False,
......@@ -92,7 +93,6 @@ def toolIP2DDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **optio
useDetailSharedHitInfo default: True
useRun2TrackGrading default: False
hitBLayerGrade default: True
hitInnerLayersGrade default: True
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -176,6 +176,7 @@ def toolIP2DTrackSelector(name, useBTagFlagsDefaults = True, **options):
OutputLevel default: BTaggingFlags.OutputLevel
useBLayerHitPrediction default: True
usepTDepTrackSel default: False
nHitBLayer default: 0
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......
......@@ -3,6 +3,8 @@
# Configuration functions for IP3DNegTag
# Author: Wouter van den Wollenberg (2013-2014)
from BTagging.BTaggingFlags import BTaggingFlags
from AtlasGeoModel.InDetGMJobProperties import GeometryFlags as geoFlags
btagrun1 = (geoFlags.Run() == "RUN1" or (geoFlags.Run() == "UNDEFINED" and geoFlags.isIBL() == False))
metaIP3DNegTag = { 'IsATagger' : True,
'xAODBaseName' : 'IP3DNeg',
......@@ -13,6 +15,8 @@ metaIP3DNegTag = { 'IsATagger' : True,
'BTagTrackToVertexIPEstimator',
'IP3DNegNewLikelihoodTool',
'IP3DNegTrackSelector',
'InDetTrackSelector',
'SpecialTrackAssociator',
'SVForIPTool_IP3DNeg',
'IP3DNegBasicTrackGradeFactory',
'IP3DNegDetailedTrackGradeFactory'],
......@@ -21,6 +25,8 @@ metaIP3DNegTag = { 'IsATagger' : True,
'trackGradeFactory' : 'IP3DNegDetailedTrackGradeFactory',
# 'trackToVertexTool' : 'BTagTrackToVertexTool',
'TrackToVertexIPEstimator' : 'BTagTrackToVertexIPEstimator',
'InDetTrackSelectionTool' : 'InDetTrackSelector',
'TrackVertexAssociationTool' : 'SpecialTrackAssociator',
'LikelihoodTool' : 'IP3DNegNewLikelihoodTool'},
# 'PassByName' : {'SecVxFinderNameForV0Removal' : 'InDetVKalVxInJetTool',
# 'SecVxFinderNameForIPSign' : 'InDetVKalVxInJetTool'},
......@@ -47,17 +53,26 @@ def toolIP3DNegTag(name, useBTagFlagsDefaults = True, **options):
flipIPSign default: True
usePosIP default: True
useNegIP default: False
jetPtMinRef default: BTaggingFlags.JetPtMinRef
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
if useBTagFlagsDefaults:
grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
"0HitInExp", "0HitIn",
"0HitNInExp", "0HitNIn",
"InANDNInShared", "PixShared", "SctShared",
"InANDNInSplit", "PixSplit",
"Good"]
if btagrun1: grades=[ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ]
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'referenceType' : BTaggingFlags.ReferenceType,
'impactParameterView' : '3D',
'trackGradePartitions' : [ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ],
'trackGradePartitions' : grades,
'RejectBadTracks' : False,
'originalTPCollectionName' : BTaggingFlags.TrackParticleCollectionName,
'jetCollectionList' : BTaggingFlags.Jets,
......@@ -67,6 +82,7 @@ def toolIP3DNegTag(name, useBTagFlagsDefaults = True, **options):
'useNegIP' : False,
'UseCHypo' : True,
'SecVxFinderName' : 'SV1',
'jetPtMinRef' : BTaggingFlags.JetPtMinRef,
}
for option in defaults:
options.setdefault(option, defaults[option])
......@@ -87,7 +103,6 @@ def toolIP3DNegDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **op
useSharedHitInfo default: True
useDetailSharedHitInfo default: True
hitBLayerGrade default: True
hitInnerLayersGrade default: True
useRun2TrackGrading default: False
input: name: The name of the tool (should be unique).
......@@ -99,8 +114,10 @@ def toolIP3DNegDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **op
'useSharedHitInfo' : True,
'useDetailSharedHitInfo' : True,
'hitBLayerGrade' : True,
'useRun2TrackGrading' : False,
'hitInnerLayersGrade' : True }
'useRun2TrackGrading' : (btagrun1 == False),
'useInnerLayers0HitInfo' : (btagrun1 == False),
'useDetailSplitHitInfo' : (btagrun1 == False),
}
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
......@@ -169,6 +186,7 @@ def toolIP3DNegTrackSelector(name, useBTagFlagsDefaults = True, **options):
OutputLevel default: BTaggingFlags.OutputLevel
useBLayerHitPrediction default: True
usepTDepTrackSel default: False
nHitBLayer default: 0
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -177,6 +195,7 @@ def toolIP3DNegTrackSelector(name, useBTagFlagsDefaults = True, **options):
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'useBLayerHitPrediction' : True,
'nHitBLayer' : 0 ,
'usepTDepTrackSel' : False }
for option in defaults:
options.setdefault(option, defaults[option])
......
......@@ -16,11 +16,15 @@ metaIP3DTag = { 'IsATagger' : True,
'BTagTrackToVertexIPEstimator',
'IP3DNewLikelihoodTool',
'IP3DTrackSelector',
'InDetTrackSelector',
'SpecialTrackAssociator',
'SVForIPTool_IP3D',
'IP3DBasicTrackGradeFactory',
'IP3DDetailedTrackGradeFactory'],
'PassByPointer' : {'SVForIPTool' : 'SVForIPTool_IP3D',
'trackSelectorTool' : 'IP3DTrackSelector',
'InDetTrackSelectionTool' : 'InDetTrackSelector',
'TrackVertexAssociationTool' : 'SpecialTrackAssociator',
'trackGradeFactory' : 'IP3DDetailedTrackGradeFactory',
# 'trackToVertexTool' : 'BTagTrackToVertexTool',
'TrackToVertexIPEstimator' : 'BTagTrackToVertexIPEstimator',
......@@ -47,6 +51,7 @@ def toolIP3DTag(name, useBTagFlagsDefaults = True, **options):
unbiasIPEstimation default: False (switch to true (better!) when creating new PDFs)
UseCHypo default: True
SecVxFinderName default: "SV1"
jetPtMinRef default: BTaggingFlags.JetPtMinRef
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -64,6 +69,7 @@ def toolIP3DTag(name, useBTagFlagsDefaults = True, **options):
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'referenceType' : BTaggingFlags.ReferenceType,
'jetPtMinRef' : BTaggingFlags.JetPtMinRef,
'impactParameterView' : '3D',
'trackGradePartitions' : grades ,
'RejectBadTracks' : False,
......@@ -95,7 +101,6 @@ def toolIP3DDetailedTrackGradeFactory(name, useBTagFlagsDefaults = True, **optio
useSharedHitInfo default: True
useDetailSharedHitInfo default: True
hitBLayerGrade default: True
hitInnerLayersGrade default: True
useRun2TrackGrading default: False
input: name: The name of the tool (should be unique).
......@@ -178,6 +183,7 @@ def toolIP3DTrackSelector(name, useBTagFlagsDefaults = True, **options):
OutputLevel default: BTaggingFlags.OutputLevel
useBLayerHitPrediction default: True
usepTDepTrackSel default: False
nHitBLayer default: 0
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
......@@ -196,6 +202,58 @@ def toolIP3DTrackSelector(name, useBTagFlagsDefaults = True, **options):
#------------------------------------------------------------------
metaInDetTrackSelector = { 'ToolCollection' : 'IP3DTag' }
def toolInDetTrackSelector(name, useBTagFlagsDefaults = True, **options):
"""Sets up a InDetTrackSelector tool and returns it.
The following options have BTaggingFlags defaults:
OutputLevel default: BTaggingFlags.OutputLevel
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'CutLevel' : "Loose",
'maxZ0SinTheta' : 3 }
# 'maxD0' : 2 }
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
return InDet__InDetTrackSelectionTool(**options)
#------------------------------------------------------------------
metaSpecialTrackAssociator = { 'ToolCollection' : 'IP3DTag' }
def toolSpecialTrackAssociator(name, useBTagFlagsDefaults = True, **options):
"""Sets up a InDetTrackSelector tool and returns it.
The following options have BTaggingFlags defaults:
OutputLevel default: BTaggingFlags.OutputLevel
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'dzSinTheta_cut' : 3,
'doPV' : True }
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
from TrackVertexAssociationTool.TrackVertexAssociationToolConf import CP__TightTrackVertexAssociationTool
return CP__TightTrackVertexAssociationTool(**options)
#------------------------------------------------------------------
metaIP3DNewLikelihoodTool = { 'CalibrationFolders' : ['IP3D',],
'DependsOn' : ['BTagCalibrationBrokerTool',],
'PassByPointer' : {'calibrationTool' : 'BTagCalibrationBrokerTool'},
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Configuration functions for JetVertexCharge
# Author: Wouter van den Wollenberg (2013-2014)
from BTagging.BTaggingFlags import BTaggingFlags
metaJetVertexCharge = { 'IsATagger' : True,
'NeedsMuonAssociator' : True,
'DependsOn' : ['AtlasExtrapolator',
'BTagTrackToVertexTool', #LC FIXME check if it works
'NewJetFitterVxFinder',
'BTagCalibrationBrokerTool',
],
'CalibrationFolders' : ['JetVertexCharge',],
'PassByPointer' : {'calibrationTool' : 'BTagCalibrationBrokerTool'},
'ToolCollection' : 'JetVertexCharge' }
def toolJetVertexCharge(name, useBTagFlagsDefaults = True, **options):
"""Sets up a JetVertexCharge tool and returns it.
The following options have BTaggingFlags defaults:
OutputLevel default: BTaggingFlags.OutputLevel
Runmodus default: BTaggingFlags.Runmodus
taggerNameBase default: "JetVertexCharge"
useForcedCalibration default: False
kFactor default: 1.1
kFactorSV default: 0.7
kFactorTV default: 0.7
Trkd0Cut default: 3.5
Trkz0Cut default: 4.5
TrkPtCut default: 500.0
TrkChi2Cut default: 5.0
CutPrecisionHits default: 9
CutPixelHits default: 1
CutTRTHits default: 9
CutIBLHits default: 0
CutSCTHits default: 4
CutSharedHits default: 2
input: name: The name of the tool (should be unique).
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'taggerNameBase' : 'JetVertexCharge',
'useForcedCalibration' : False,
'kFactor' : 1.1,
'kFactorSV' : 0.7,
'kFactorTV' : 0.7,
'Trkd0Cut' : 3.5,
'Trkz0Cut' : 4.5,
'TrkPtCut' : 500.0,
'TrkChi2Cut' : 5.0,
'CutPrecisionHits' : 9,
'CutPixelHits' : 1,
'CutTRTHits' : 9,
'CutIBLHits' : 0,
'CutSCTHits' : 4,
'CutSharedHits' : 2,
}
if(BTaggingFlags.Runmodus == 'reference'):
defaults['BTagJetEtamin'] = 2.5
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
from JetTagTools.JetTagToolsConf import Analysis__JetVertexCharge
return Analysis__JetVertexCharge(**options)
......@@ -11,7 +11,8 @@ metaMV2c00FlipTag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DNegTag',
'IP3DNegTag',
'JetFitterTagCOMBNNIP3DNeg',
# 'JetFitterTagCOMBNNIP3DNeg',
'NewJetFitterVxFinderFlip',
'SV0Tag',
'SV1FlipTag'],
'CalibrationFolders' : ['MV2c00',],
......
......@@ -11,7 +11,8 @@ metaMV2c00Tag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DTag',
'IP3DTag',
'JetFitterTagCOMBNN',
# 'JetFitterTagCOMBNN',
'NewJetFitterVxFinder',
'SV0Tag',
'SV1Tag'],
'CalibrationFolders' : ['MV2c00',],
......
......@@ -11,7 +11,8 @@ metaMV2c100FlipTag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DNegTag',
'IP3DNegTag',
'JetFitterTagCOMBNNIP3DNeg',
# 'JetFitterTagCOMBNNIP3DNeg',
'NewJetFitterVxFinderFlip',
'SV0Tag',
'SV1FlipTag'],
'CalibrationFolders' : ['MV2c100',],
......
......@@ -11,7 +11,8 @@ metaMV2c100Tag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DTag',
'IP3DTag',
'JetFitterTagCOMBNN',
# 'JetFitterTagCOMBNN',
'NewJetFitterVxFinder',
'SV0Tag',
'SV1Tag'],
'CalibrationFolders' : ['MV2c100',],
......
......@@ -11,7 +11,8 @@ metaMV2c10FlipTag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DNegTag',
'IP3DNegTag',
'JetFitterTagCOMBNNIP3DNeg',
# 'JetFitterTagCOMBNNIP3DNeg',
'NewJetFitterVxFinderFlip',
'SV0Tag',
'SV1FlipTag'],
'CalibrationFolders' : ['MV2c10',],
......
......@@ -11,7 +11,8 @@ metaMV2c10Tag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DTag',
'IP3DTag',
'JetFitterTagCOMBNN',
# 'JetFitterTagCOMBNN',
'NewJetFitterVxFinder',
'SV0Tag',
'SV1Tag'],
'CalibrationFolders' : ['MV2c10',],
......
......@@ -11,7 +11,8 @@ metaMV2c20FlipTag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DNegTag',
'IP3DNegTag',
'JetFitterTagCOMBNNIP3DNeg',
# 'JetFitterTagCOMBNNIP3DNeg',
'NewJetFitterVxFinderFlip',
'SV0Tag',
'SV1FlipTag'],
'CalibrationFolders' : ['MV2c20',],
......
......@@ -11,7 +11,8 @@ metaMV2c20Tag = { 'IsATagger' : True,
'BTagCalibrationBrokerTool',
'IP2DTag',
'IP3DTag',
'JetFitterTagCOMBNN',
# 'JetFitterTagCOMBNN',
'NewJetFitterVxFinder',
'SV0Tag',
'SV1Tag'],
'CalibrationFolders' : ['MV2c20',],
......@@ -25,6 +26,7 @@ def toolMV2c20Tag(name, useBTagFlagsDefaults = True, **options):
OutputLevel default: BTaggingFlags.OutputLevel
Runmodus default: BTaggingFlags.Runmodus
DecorateMvaInputs default: BTaggingFlags.DecorateMvaInputs
taggerName default: "MV2c20"
taggerNameBase default: "MV2c20"
forceMV2CalibrationAlias default: BTaggingFlags.ForceMV2CalibrationAlias
......@@ -44,6 +46,7 @@ def toolMV2c20Tag(name, useBTagFlagsDefaults = True, **options):
if useBTagFlagsDefaults:
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
'Runmodus' : BTaggingFlags.Runmodus,
'DecorateMvaInputs' : BTaggingFlags.DecorateMvaInputs,
'taggerName' : 'MV2c20',
'taggerNameBase' : 'MV2c20',
'forceMV2CalibrationAlias' : BTaggingFlags.ForceMV2CalibrationAlias,
......
......@@ -5,18 +5,19 @@
from BTagging.BTaggingFlags import BTaggingFlags
metaMVbTag = { 'IsATagger' : True,
'xAODBaseName' : 'MVb',
'xAODBaseName' : 'MV2c10b',
'DependsOn' : ['AtlasExtrapolator',
'BTagTrackToVertexTool',
'BTagCalibrationBrokerTool',
'IP2DTag',
'IP3DTag',
'JetFitterTagCOMBNN',
# 'JetFitterTagCOMBNN',
'NewJetFitterVxFinder',
'SV0Tag',
'SV1Tag'],
'CalibrationFolders' :