Skip to content
Snippets Groups Projects
Commit e709ce36 authored by James Catmore's avatar James Catmore
Browse files

Merge branch '21.2-btag-smartslimming' into '21.2'

21.2 btag smartslimming

See merge request !4192

Former-commit-id: 868d724d8b4123ef4ce4abc15082c987dfd2f5d7
parents c333b72a 36d3b93b
No related branches found
No related tags found
No related merge requests found
......@@ -375,20 +375,20 @@ class SlimmingHelper:
#from DerivationFrameworkCore.AntiKt4EMPFlowJetsCPContent import AntiKt4EMPFlowJetsCPContent
items.extend(AntiKt4EMPFlowJetsCPContent)
elif collectionName=="BTagging_AntiKt4LCTopo":
from DerivationFrameworkFlavourTag.BTagging_AntiKt4LCTopoCPContent import BTagging_AntiKt4LCTopoCPContent
items.extend(BTagging_AntiKt4LCTopoCPContent)
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt4LCTopoJets"))
elif collectionName=="BTagging_AntiKt4EMTopo":
from DerivationFrameworkFlavourTag.BTagging_AntiKt4EMTopoCPContent import BTagging_AntiKt4EMTopoCPContent
items.extend(BTagging_AntiKt4EMTopoCPContent)
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt4EMTopoJets"))
elif collectionName=="BTagging_AntiKt2Track":
from DerivationFrameworkFlavourTag.BTagging_AntiKt2TrackCPContent import BTagging_AntiKt2TrackCPContent
items.extend(BTagging_AntiKt2TrackCPContent)
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt2TrackJets"))
elif collectionName=="BTagging_AntiKt3Track":
from DerivationFrameworkFlavourTag.BTagging_AntiKt3TrackCPContent import BTagging_AntiKt3TrackCPContent
items.extend(BTagging_AntiKt3TrackCPContent)
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt3TrackJets"))
elif collectionName=="BTagging_AntiKt4Track":
from DerivationFrameworkFlavourTag.BTagging_AntiKt4TrackCPContent import BTagging_AntiKt4TrackCPContent
items.extend(BTagging_AntiKt4TrackCPContent)
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt4TrackJets"))
elif collectionName=="InDetTrackParticles":
#from DerivationFrameworkInDet.InDetTrackParticlesCPContent import InDetTrackParticlesCPContent
from DerivationFrameworkCore.InDetTrackParticlesCPContent import InDetTrackParticlesCPContent
......
......@@ -44,18 +44,18 @@ def BTaggingExpertContent(jetcol):
def BTaggingStandardContent(jetcol):
btagjetcoltmp = "BTagging_" + rchop(jetcol, "Jets")
btaggingtmp = "BTagging_" + rchop(jetcol, "Jets")
# deal with name mismatch between PV0TrackJets and BTagging_Track
btagjetcol = btagjetcoltmp.replace("PV0Track", "Track")
btagging = btaggingtmp.replace("PV0Track", "Track")
jetcontent = \
[ ".".join( [ jetcol ] + JetStandardAux )
]
[ jetcol ] \
+ [ ".".join( [ jetcol + "Aux" ] + JetStandardAux ) ]
btagcontent = \
[ ".".join( [ btagjetcol ] + BTaggingStandardAux )
]
[ btagging ] \
+ [ ".".join( [ btagging + "Aux" ] + BTaggingStandardAux ) ]
return jetcontent + btagcontent
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
BTagging_AntiKt2TrackCPContent = [
"AntiKt2PV0TrackJets",
"AntiKt2PV0TrackJetsAux.pt.eta.btagging.btaggingLink.TruthLabelID.constituentLinks.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.HighestJVFLooseVtx.ConeTruthLabelID.GhostAntiKt2TrackJet.PartonTruthLabelID.Jvt.HadronConeExclTruthLabelID",
"BTagging_AntiKt2Track",
"BTagging_AntiKt2TrackAux.SV1_pb.SV1_pu.IP3D_pb.IP3D_pu.MV2c00_discriminant.MV2c10_discriminant.MV2c20_discriminant.MVb_discriminant.MV1_discriminant.MSV_vertices.MV1c_discriminant.SV0_badTracksIP.SV0_vertices.SV1_badTracksIP.SV1_vertices.BTagTrackToJetAssociator.BTagTrackToJetAssociatorBB.JetFitter_JFvertices.JetFitter_tracksAtPVlinks.MSV_badTracksIP.MV2c100_discriminant.MV2m_pu.MV2m_pc.MV2m_pb"
]
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
BTagging_AntiKt4EMTopoCPContent = [
"AntiKt4EMTopoJets",
"AntiKt4EMTopoJetsAux.pt.eta.btagging.btaggingLink.TruthLabelID.constituentLinks.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.HighestJVFLooseVtx.ConeTruthLabelID.GhostAntiKt2TrackJet.PartonTruthLabelID.Jvt.HadronConeExclTruthLabelID",
"BTagging_AntiKt4EMTopo",
"BTagging_AntiKt4EMTopoAux.SV1_pb.SV1_pu.IP3D_pb.IP3D_pu.MV2c00_discriminant.MV2c10_discriminant.MV2c20_discriminant.MVb_discriminant.MV1_discriminant.MSV_vertices.MV1c_discriminant.SV0_badTracksIP.SV0_vertices.SV1_badTracksIP.SV1_vertices.BTagTrackToJetAssociator.BTagTrackToJetAssociatorBB.JetFitter_JFvertices.JetFitter_tracksAtPVlinks.MSV_badTracksIP.MV2c100_discriminant.MV2m_pu.MV2m_pc.MV2m_pb"
]
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
BTagging_AntiKt4LCTopoCPContent = [
"AntiKt4LCTopoJets",
"AntiKt4LCTopoJetsAux.pt.eta.btagging.btaggingLink.TruthLabelID.constituentLinks.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.HighestJVFLooseVtx.ConeTruthLabelID.GhostAntiKt2TrackJet.PartonTruthLabelID.Jvt.HadronConeExclTruthLabelID",
"BTagging_AntiKt4LCTopo",
"BTagging_AntiKt4LCTopoAux.SV1_pb.SV1_pu.IP3D_pb.IP3D_pu.MV2c00_discriminant.MV2c10_discriminant.MV2c20_discriminant.MVb_discriminant.MV1_discriminant.MSV_vertices.MV1c_discriminant.SV0_badTracksIP.SV0_vertices.SV1_badTracksIP.SV1_vertices.BTagTrackToJetAssociator.BTagTrackToJetAssociatorBB.JetFitter_JFvertices.JetFitter_tracksAtPVlinks.MSV_badTracksIP.MV2c100_discriminant.MV2m_pu.MV2m_pc.MV2m_pb",
]
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
BTagging_AntiKt4TrackCPContent = [
"AntiKt4PV0TrackJets",
"AntiKt4PV0TrackJetsAux.pt.eta.btagging.btaggingLink.TruthLabelID.constituentLinks.GhostBHadronsFinal.GhostBHadronsInitial.GhostBQuarksFinal.GhostCHadronsFinal.GhostCHadronsInitial.GhostCQuarksFinal.GhostHBosons.GhostPartons.GhostTQuarksFinal.GhostTausFinal.GhostWBosons.GhostZBosons.GhostTruth.OriginVertex.GhostAntiKt3TrackJet.GhostAntiKt4TrackJet.GhostMuonSegment.GhostTrack.GhostTruthAssociationLink.HighestJVFVtx.ConeExclBHadronsFinal.ConeExclCHadronsFinal.ConeExclTausFinal.HighestJVFLooseVtx.ConeTruthLabelID.GhostAntiKt4TrackJet.PartonTruthLabelID.Jvt.HadronConeExclTruthLabelID",
"BTagging_AntiKt4Track",
"BTagging_AntiKt4TrackAux.SV1_pb.SV1_pu.IP3D_pb.IP3D_pu.MV2c00_discriminant.MV2c10_discriminant.MV2c20_discriminant.MVb_discriminant.MV1_discriminant.MSV_vertices.MV1c_discriminant.SV0_badTracksIP.SV0_vertices.SV1_badTracksIP.SV1_vertices.BTagTrackToJetAssociator.BTagTrackToJetAssociatorBB.JetFitter_JFvertices.JetFitter_tracksAtPVlinks.MSV_badTracksIP.MV2c100_discriminant.MV2m_pu.MV2m_pc.MV2m_pb"
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment