Skip to content
Snippets Groups Projects
Commit ee6f55ce authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'add_GNNVertices_in_FTAG2' into 'main' 

add GNNVertices in FTAG2

See merge request !71676
parents 5caec8b5 145175fd
No related branches found
No related tags found
28 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!72336Fixed TRT calibration crash,!72176Draft: Improving L1TopoOnline chain that now gets no-empty plots. Activating it by default,!72012Draft: Separate JiveXMLConfig.py into Config files,!71876Fix MET trigger name in MissingETMonitoring,!71820Draft: Adding new TLA End-Of-Fill (EOF) chains and removing obsolete DIPZ chains,!71676add GNNVertices in FTAG2
Hide whitespace changes
Inline Side-by-side
PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
+ 5
− 17
View file @ ee6f55ce
...@@ -136,16 +136,14 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All ...@@ -136,16 +136,14 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All
"JetAssociatedSCTClusters", "JetAssociatedSCTClusters",
] ]
if flags.BTagging.RunNewVrtSecInclusive:
FTAG1SlimmingHelper.AppendToDictionary.update({'NVSI_SecVrt_Tight' : 'xAOD::VertexContainer','NVSI_SecVrt_TightAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Medium' : 'xAOD::VertexContainer','NVSI_SecVrt_MediumAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Loose' : 'xAOD::VertexContainer','NVSI_SecVrt_LooseAux' : 'xAOD::VertexAuxContainer'})
# Append to dictionary
from DerivationFrameworkFlavourTag import FtagBaseContent from DerivationFrameworkFlavourTag import FtagBaseContent
# update AppendToDictionary
extra_AppendToDictionary = {} #only add those items specifically for FTAG1 here!
FtagBaseContent.update_AppendToDictionary_in_SlimmingHelper(FTAG1SlimmingHelper, flags, extra_AppendToDictionary)
# Static content # Static content
StaticContent = [] StaticContent = [] #only add extra static content for FTAG1 here!
if flags.BTagging.AddV0Finder: if flags.BTagging.AddV0Finder:
FTAGV0ContainerName = "FTAGRecoV0Candidates" FTAGV0ContainerName = "FTAGRecoV0Candidates"
FTAGKshortContainerName = "FTAGRecoKshortCandidates" FTAGKshortContainerName = "FTAGRecoKshortCandidates"
...@@ -167,18 +165,9 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All ...@@ -167,18 +165,9 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All
StaticContent += ["xAOD::VertexContainer#%s" % cascades] StaticContent += ["xAOD::VertexContainer#%s" % cascades]
StaticContent += ["xAOD::VertexAuxContainer#%sAux.-vxTrackAtVertex" % cascades] StaticContent += ["xAOD::VertexAuxContainer#%sAux.-vxTrackAtVertex" % cascades]
FtagBaseContent.add_static_content_to_SlimmingHelper(FTAG1SlimmingHelper, StaticContent)
if flags.BTagging.RunNewVrtSecInclusive: FtagBaseContent.add_static_content_to_SlimmingHelper(FTAG1SlimmingHelper, flags, StaticContent)
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexContainer#NVSI_SecVrt_Loose", "xAOD::VertexContainer#NVSI_SecVrt_Medium", "xAOD::VertexContainer#NVSI_SecVrt_Tight"]
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_LooseAux."+excludedVertexAuxData]
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_MediumAux."+excludedVertexAuxData ]
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_TightAux."+excludedVertexAuxData]
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexContainer#GNNVertices"]
FTAG1SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#GNNVerticesAux."+excludedVertexAuxData]
# Add truth containers # Add truth containers
if flags.Input.isMC: if flags.Input.isMC:
...@@ -190,7 +179,6 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All ...@@ -190,7 +179,6 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All
# Add ExtraVariables # Add ExtraVariables
FtagBaseContent.add_ExtraVariables_to_SlimmingHelper(FTAG1SlimmingHelper) FtagBaseContent.add_ExtraVariables_to_SlimmingHelper(FTAG1SlimmingHelper)
FTAG1SlimmingHelper.ExtraVariables += ["AntiKt4EMPFlowJets.GNNVerticesLink"]
# Trigger content # Trigger content
FtagBaseContent.trigger_setup(FTAG1SlimmingHelper, trigger_option) FtagBaseContent.trigger_setup(FTAG1SlimmingHelper, trigger_option)
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py
+ 5
− 14
View file @ ee6f55ce
...@@ -113,24 +113,15 @@ def FTAG2Cfg(flags): ...@@ -113,24 +113,15 @@ def FTAG2Cfg(flags):
"TruthBottom", "TruthElectrons","TruthMuons","TruthTaus", "TruthBottom", "TruthElectrons","TruthMuons","TruthTaus",
] ]
if flags.BTagging.RunNewVrtSecInclusive:
FTAG2SlimmingHelper.AppendToDictionary.update({'NVSI_SecVrt_Tight' : 'xAOD::VertexContainer','NVSI_SecVrt_TightAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Medium' : 'xAOD::VertexContainer','NVSI_SecVrt_MediumAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Loose' : 'xAOD::VertexContainer','NVSI_SecVrt_LooseAux' : 'xAOD::VertexAuxContainer'})
from DerivationFrameworkFlavourTag import FtagBaseContent from DerivationFrameworkFlavourTag import FtagBaseContent
# update AppendToDictionary
extra_AppendToDictionary = {} #only add those items specifically for FTAG2 here!
FtagBaseContent.update_AppendToDictionary_in_SlimmingHelper(FTAG2SlimmingHelper, flags, extra_AppendToDictionary)
# Static content # Static content
FtagBaseContent.add_static_content_to_SlimmingHelper(FTAG2SlimmingHelper) extra_StaticContent = [] #only add those items specifically for FTAG2 here!
FtagBaseContent.add_static_content_to_SlimmingHelper(FTAG2SlimmingHelper, flags, extra_StaticContent)
if flags.BTagging.RunNewVrtSecInclusive:
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
FTAG2SlimmingHelper.StaticContent += ["xAOD::VertexContainer#NVSI_SecVrt_Loose",
"xAOD::VertexContainer#NVSI_SecVrt_Medium",
"xAOD::VertexContainer#NVSI_SecVrt_Tight"]
FTAG2SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_LooseAux."+excludedVertexAuxData]
FTAG2SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_MediumAux."+excludedVertexAuxData ]
FTAG2SlimmingHelper.StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_TightAux."+excludedVertexAuxData]
# Add truth containers # Add truth containers
if flags.Input.isMC: if flags.Input.isMC:
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagBaseContent.py
+ 20
− 3
View file @ ee6f55ce
...@@ -19,7 +19,7 @@ PHYSVAL_FTAG1_FTAG2_ExtraVariables = [ ...@@ -19,7 +19,7 @@ PHYSVAL_FTAG1_FTAG2_ExtraVariables = [
"Photons.TruthLink", "Photons.TruthLink",
"AntiKt2PV0TrackJets.pt.eta.phi.m", "AntiKt2PV0TrackJets.pt.eta.phi.m",
"AntiKt4EMTopoJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.PartonTruthLabelID.GhostBHadronsFinalPt", "AntiKt4EMTopoJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.PartonTruthLabelID.GhostBHadronsFinalPt",
"AntiKt4EMPFlowJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.DFCommonJets_fJvt.GhostBHadronsFinalPt.SumPtChargedPFOPt1000.SumPtTrkPt1000.TrackSumMass.TrackSumPt.TrackWidthPt500.TracksForBTagging.TruthLabelDeltaR_B.TruthLabelDeltaR_C.TruthLabelDeltaR_T.JetEMScaleMomentum_pt.JetEMScaleMomentum_eta.HECQuality.GhostHBosonsPt", "AntiKt4EMPFlowJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.DFCommonJets_fJvt.GhostBHadronsFinalPt.SumPtChargedPFOPt1000.SumPtTrkPt1000.TrackSumMass.TrackSumPt.TrackWidthPt500.TracksForBTagging.TruthLabelDeltaR_B.TruthLabelDeltaR_C.TruthLabelDeltaR_T.JetEMScaleMomentum_pt.JetEMScaleMomentum_eta.HECQuality.GhostHBosonsPt.GNNVerticesLink",
"TruthPrimaryVertices.t.x.y.z", "TruthPrimaryVertices.t.x.y.z",
"TauNeutralParticleFlowObjects.pt.eta.phi.m.bdtPi0Score.nPi0Proto", "TauNeutralParticleFlowObjects.pt.eta.phi.m.bdtPi0Score.nPi0Proto",
"TauChargedParticleFlowObjects.pt.eta.phi.m.bdtPi0Score", "TauChargedParticleFlowObjects.pt.eta.phi.m.bdtPi0Score",
...@@ -36,10 +36,27 @@ PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool ...@@ -36,10 +36,27 @@ PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool
PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Loose_VerticesAux." + excludedVertexAuxData] PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Loose_VerticesAux." + excludedVertexAuxData]
PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxAux.-vxTrackAtVertex"] PHYSVAL_FTAG1_FTAG2_StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxAux.-vxTrackAtVertex"]
## Common functions used in PHYSVAL, FTAG1 and FTAG2 ## Common functions used in PHYSVAL, FTAG1 and FTAG2
def add_static_content_to_SlimmingHelper(SlimmingHelper, extra_StaticContent=[]): def update_AppendToDictionary_in_SlimmingHelper(SlimmingHelper, flags, extra_AppendToDictionary={}):
if flags.BTagging.RunNewVrtSecInclusive:
SlimmingHelper.AppendToDictionary.update({'NVSI_SecVrt_Tight' : 'xAOD::VertexContainer','NVSI_SecVrt_TightAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Medium' : 'xAOD::VertexContainer','NVSI_SecVrt_MediumAux' : 'xAOD::VertexAuxContainer',
'NVSI_SecVrt_Loose' : 'xAOD::VertexContainer','NVSI_SecVrt_LooseAux' : 'xAOD::VertexAuxContainer'})
if len(extra_AppendToDictionary)>0:
SlimmingHelper.AppendToDictionary.update(extra_AppendToDictionary)
def add_static_content_to_SlimmingHelper(SlimmingHelper, flags, extra_StaticContent=[]):
all_StaticContent = PHYSVAL_FTAG1_FTAG2_StaticContent all_StaticContent = PHYSVAL_FTAG1_FTAG2_StaticContent
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
all_StaticContent += ["xAOD::VertexContainer#GNNVertices"]
all_StaticContent += ["xAOD::VertexAuxContainer#GNNVerticesAux."+excludedVertexAuxData]
if flags.BTagging.RunNewVrtSecInclusive:
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
all_StaticContent += ["xAOD::VertexContainer#NVSI_SecVrt_Loose", "xAOD::VertexContainer#NVSI_SecVrt_Medium", "xAOD::VertexContainer#NVSI_SecVrt_Tight"]
all_StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_LooseAux."+excludedVertexAuxData]
all_StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_MediumAux."+excludedVertexAuxData ]
all_StaticContent += ["xAOD::VertexAuxContainer#NVSI_SecVrt_TightAux."+excludedVertexAuxData]
if len(extra_StaticContent) > 0: if len(extra_StaticContent) > 0:
all_StaticContent += extra_StaticContent all_StaticContent += extra_StaticContent
SlimmingHelper.StaticContent = all_StaticContent SlimmingHelper.StaticContent = all_StaticContent
......
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