Commit 17540588 authored by Ligang Xia's avatar Ligang Xia
Browse files

r21 try for ATLFTAGDPD-265

parent 659f70ac
......@@ -28,6 +28,9 @@ from DerivationFrameworkFlavourTag.FlavourTagAllVariables import FTAllVars_bjetT
from DerivationFrameworkFlavourTag.FlavourTagExtraVariables import FTExtraVars_bjetTriggerTracks
from DerivationFrameworkFlavourTag.FlavourTagExtraVariables import FTExtraVars_bjetTriggerTracks
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doPseudoTracking = True
#====================================================================
# Create Private Sequence
#====================================================================
......@@ -210,21 +213,21 @@ applySoftBtagging("softBtag", FTAG1Seq ) # SV tagger in VrtSecInclusive
# Add Large-R RC jets w/ ExKt 2 & 3 subjets
#===================================================================
addExKtDoubleTaggerRCJets(FTAG1Seq, ToolSvc)
#addExKtDoubleTaggerRCJets(FTAG1Seq, ToolSvc)
#===================================================================
# Variable Radius (VR) Jets
#===================================================================
# Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet
addVRJets(FTAG1Seq)
addVRJets(FTAG1Seq, do_ghost=True)
addVRJets(FTAG1Seq, training='201903') #new trackjet training!
addVRJets(FTAG1Seq, training='201903', do_ghost=True) #new trackjet training!
# alias for VR
BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo",
"AntiKtVR30Rmax4Rmin02TrackGhostTag->AntiKtVR30Rmax4Rmin02TrackGhostTag,AntiKt4EMTopo"]
#addVRJets(FTAG1Seq)
#addVRJets(FTAG1Seq, do_ghost=True)
#addVRJets(FTAG1Seq, training='201903') #new trackjet training!
#addVRJets(FTAG1Seq, training='201903', do_ghost=True) #new trackjet training!
#
## alias for VR
#BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo",
# "AntiKtVR30Rmax4Rmin02TrackGhostTag->AntiKtVR30Rmax4Rmin02TrackGhostTag,AntiKt4EMTopo"]
#===================================================================
# Tag custom or pre-built jet collections
......@@ -258,6 +261,7 @@ FTAG1SlimmingHelper = SlimmingHelper("FTAG1SlimmingHelper")
FTAG1SlimmingHelper.SmartCollections = ["Electrons","Muons",
"PrimaryVertices",
"InDetTrackParticles",
#"InDetPseudoTrackParticles",
"MET_Reference_AntiKt4EMTopo",
"MET_Reference_AntiKt4EMPFlow",
"AntiKt4EMTopoJets",
......@@ -265,21 +269,21 @@ FTAG1SlimmingHelper.SmartCollections = ["Electrons","Muons",
"AntiKt8EMPFlowJets",
"AntiKt8EMPFlowExKt2SubJets",
"AntiKt8EMPFlowExKt3SubJets",
"BTagging_AntiKt8EMPFlowExKt2Sub",
"BTagging_AntiKt8EMPFlowExKt3Sub",
"AntiKt8EMPFlowExKt2GASubJets",
#"BTagging_AntiKt8EMPFlowExKt2Sub",
#"BTagging_AntiKt8EMPFlowExKt3Sub",
#"AntiKt8EMPFlowExKt2GASubJets",
"AntiKt8EMPFlowExKt3GASubJets",
"BTagging_AntiKt8EMPFlowExKt2GASub",
#"BTagging_AntiKt8EMPFlowExKt2GASub",
"BTagging_AntiKt8EMPFlowExKt3GASub",
]
FTAG1SlimmingHelper.AllVariables = ["AntiKt4EMTopoJets", "AntiKt4EMPFlowJets",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtx",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTag",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtx",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtx",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTag",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtx",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2Sub",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJFVtx",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3Sub",
......@@ -307,6 +311,7 @@ FTAG1SlimmingHelper.AllVariables = ["AntiKt4EMTopoJets", "AntiKt4EMPFlowJets",
"HLT_xAOD__VertexContainer_SecondaryVertex",
"HLT_xAOD__JetContainer_FarawayJet",
"HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig",
"InDetPseudoTrackParticles",
]
for FT1_bjetTriggerVtx in FTAllVars_bjetTriggerVtx:
......@@ -317,6 +322,7 @@ FTAG1SlimmingHelper.ExtraVariables += ["InDetTrackParticles.truthMatchProbabilit
"InDetTrackParticles.numberOfPixelSplitHits.numberOfInnermostPixelLayerSharedHits.numberOfContribPixelLayers.hitPattern.radiusOfFirstHit",
"InDetTrackParticles.is_selected.is_associated.is_svtrk_final.pt_wrtSV.eta_wrtSV.phi_wrtSV.d0_wrtSV.z0_wrtSV.errP_wrtSV.errd0_wrtSV.errz0_wrtSV.chi2_toSV",
"InDetTrackParticles.btagIp_d0.btagIp_z0SinTheta.btagIp_d0Uncertainty.btagIp_z0SinThetaUncertainty.btagIp_trackDisplacement.btagIp_trackMomentum",
"InDetPseduoTrackParticles.btagIp_d0.btagIp_z0SinTheta.btagIp_d0Uncertainty.btagIp_z0SinThetaUncertainty.btagIp_trackDisplacement.btagIp_trackMomentum",
"PrimaryVertices.neutralWeights.numberDoF.sumPt2.chiSquared.covariance.trackWeights",
"CombinedMuonTrackParticles.vx.vy.vz",
"ExtrapolatedMuonTrackParticles.vx.vy.vz",
......@@ -333,10 +339,10 @@ FTAG1SlimmingHelper.ExtraVariables += ["InDetTrackParticles.truthMatchProbabilit
"BTagging_AntiKt4EMPFlow_201810SecVtx.-vxTrackAtVertex",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtx.-vxTrackAtVertex",
"BTagging_AntiKt4EMPFlow_201903SecVtx.-vxTrackAtVertex",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtx.-vxTrackAtVertex",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtx.-vxTrackAtVertex",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtx.-vxTrackAtVertex",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtx.-vxTrackAtVertex",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtx.-vxTrackAtVertex",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtx.-vxTrackAtVertex",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtx.-vxTrackAtVertex",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtx.-vxTrackAtVertex",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubSecVtx.-vxTrackAtVertex",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubSecVtx.-vxTrackAtVertex",
"BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubSecVtx.-vxTrackAtVertex",
......@@ -405,22 +411,22 @@ FTAG1SlimmingHelper.AppendToDictionary = {
"BTagging_AntiKt4EMPFlow_201810SecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKt4EMPFlow_201903SecVtx" : "xAOD::VertexContainer",
"BTagging_AntiKt4EMPFlow_201903SecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtx" : "xAOD::BTagVertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtxAux" : "xAOD::BTagVertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtx" : "xAOD::VertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtx" : "xAOD::BTagVertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtxAux" : "xAOD::BTagVertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtx" : "xAOD::VertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagJFVtx" : "xAOD::BTagVertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagJFVtxAux" : "xAOD::BTagVertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtx" : "xAOD::VertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagJFVtx" : "xAOD::BTagVertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagJFVtxAux" : "xAOD::BTagVertexAuxContainer",
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtx" : "xAOD::VertexContainer" ,
"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtxAux" : "xAOD::VertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtx" : "xAOD::BTagVertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810JFVtxAux" : "xAOD::BTagVertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtx" : "xAOD::VertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810SecVtxAux" : "xAOD::VertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtx" : "xAOD::BTagVertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903JFVtxAux" : "xAOD::BTagVertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtx" : "xAOD::VertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903SecVtxAux" : "xAOD::VertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagJFVtx" : "xAOD::BTagVertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagJFVtxAux" : "xAOD::BTagVertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtx" : "xAOD::VertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTagSecVtxAux" : "xAOD::VertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagJFVtx" : "xAOD::BTagVertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagJFVtxAux" : "xAOD::BTagVertexAuxContainer",
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtx" : "xAOD::VertexContainer" ,
#"BTagging_AntiKtVR30Rmax4Rmin02Track_201903GhostTagSecVtxAux" : "xAOD::VertexAuxContainer",
"BTagging_AntiKt2TrackJFVtx" : "xAOD::BTagVertexContainer" ,
"BTagging_AntiKt2TrackJFVtxAux" : "xAOD::BTagVertexAuxContainer",
"BTagging_AntiKt2TrackSecVtx" : "xAOD::VertexContainer" ,
......@@ -447,10 +453,10 @@ FTAG1SlimmingHelper.AppendToDictionary = {
"AntiKt8EMPFlowExKt3SubJetsAux" : "xAOD::JetAuxContainer" ,
"BTagging_AntiKt8EMPFlowExKt3Sub" : "xAOD::BTaggingContainer" ,
"BTagging_AntiKt8EMPFlowExKt3SubAux" : "xAOD::BTaggingAuxContainer",
"AntiKt8EMPFlowExKt2GASubJets" : "xAOD::JetContainer" ,
"AntiKt8EMPFlowExKt2GASubJetsAux" : "xAOD::JetAuxContainer" ,
"BTagging_AntiKt8EMPFlowExKt2GASub" : "xAOD::BTaggingContainer" ,
"BTagging_AntiKt8EMPFlowExKt2GASubAux" : "xAOD::BTaggingAuxContainer",
#"AntiKt8EMPFlowExKt2GASubJets" : "xAOD::JetContainer" ,
#"AntiKt8EMPFlowExKt2GASubJetsAux" : "xAOD::JetAuxContainer" ,
#"BTagging_AntiKt8EMPFlowExKt2GASub" : "xAOD::BTaggingContainer" ,
#"BTagging_AntiKt8EMPFlowExKt2GASubAux" : "xAOD::BTaggingAuxContainer",
"AntiKt8EMPFlowExKt3GASubJets" : "xAOD::JetContainer" ,
"AntiKt8EMPFlowExKt3GASubJetsAux" : "xAOD::JetAuxContainer" ,
"BTagging_AntiKt8EMPFlowExKt3GASub" : "xAOD::BTaggingContainer" ,
......
......@@ -489,7 +489,7 @@ class Configuration:
'thisBTagTrackAssociation_'+jetcol+self.GeneralToolSuffix(),
AssociatedTrackLinks = TrackAssociatorName,
AssociatedMuonLinks = "MatchedMuons",
TrackContainerName = "InDetTrackParticles",
TrackContainerName = "InDetPseudoTrackParticles",
MuonContainerName = "Muons",
TrackAssociationName = "BTagTrackToJetAssociator",
MuonAssociationName = "Muons"
......@@ -2059,7 +2059,7 @@ from ParticleJetTools.ParticleJetToolsConf import JetParticleShrinkingConeAssoci
defaultTrackAssoc = \
JetParticleShrinkingConeAssociation(
"DefaultBTaggingTrackAssoc",
InputParticleCollectionName="InDetTrackParticles",
InputParticleCollectionName="InDetPseudoTrackParticles",
OutputCollectionName="MatchedTracks",
coneSizeFitPar1=+0.239,
coneSizeFitPar2=-1.220,
......@@ -2076,7 +2076,7 @@ defaultMuonAssoc = \
comTrackAssoc = JetParticleCenterOfMassAssociation(
"CoMBTaggingTrackAssoc",
inputTrackCollectionName="InDetTrackParticles",
inputTrackCollectionName="InDetPseudoTrackParticles",
partMatchCone = 0.8,
parentJetCone = 1.0,
OutputCollectionName="MatchedTracks",
......
......@@ -381,7 +381,8 @@ class _BTaggingFlags:
setattr(self, attr, 'matchQuark')
for attr in self._TrackParticleCollectionName:
setattr(self, attr, 'InDetTrackParticles')
#setattr(self, attr, 'InDetTrackParticles')
setattr(self, attr, 'InDetPseudoTrackParticles')
for attr in self._TrackParticleTruthCollectionName:
setattr(self, attr, 'TrackParticleTruthCandidate')
......
......@@ -76,6 +76,7 @@ if rec.doESD():
#InDetFlags.primaryVertexSetup = 'DefaultFullFinding'
#InDetFlags.useBeamConstraint = False
#InDetFlags.primaryVertexCutSetup = "StartUp"
InDetFlags.doPseudoTracking = True
InDetFlags.doLowPt = True
#InDetFlags.doMinBias = True
InDetFlags.doSlimming = False #if true, pb in 15.6.7... to be undestood
......
......@@ -32,7 +32,7 @@ namespace Analysis {
m_dec_track_mom("DUMMYv"),
m_prefix("btagIp_"),
m_primaryVertexContainer("PrimaryVertices"),
m_trackContainer("InDetTrackParticles")
m_trackContainer("InDetPseudoTrackParticles")
{
declareProperty( "TrackToVertexIPEstimator", m_track_to_vx );
declareProperty("Extrapolator", m_extrapolator);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment