From 93bb5dcc2c27158b7d496494471d47ff2add1e39 Mon Sep 17 00:00:00 2001
From: Giuseppe Callea <giuseppe.callea@cern.ch>
Date: Fri, 9 Jul 2021 09:46:11 +0000
Subject: [PATCH 1/2] Adding GA VR track-jets to LCTopo large-R jet

---
 .../DerivationFrameworkPhys/share/PHYS.py            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index ea666bf55ed7..e46627cfe2ab 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -18,6 +18,7 @@ from DerivationFrameworkEGamma import ElectronsCPDetailedContent
 from DerivationFrameworkJetEtMiss import METCommon
 from DerivationFrameworkJetEtMiss.METCommon import scheduleMETAssocAlg
 from DerivationFrameworkCore import LHE3WeightMetadata
+from DerivationFrameworkFlavourTag.HbbCommon import *
 
 #====================================================================
 # Set up sequence for this format and add to the top sequence 
@@ -173,6 +174,12 @@ PHYSSlimmingHelper.IncludeBJetTriggerContent = False
 PHYSSlimmingHelper.IncludeBPhysTriggerContent = False
 PHYSSlimmingHelper.IncludeMinBiasTriggerContent = False
 
+# Adding Ghost-associated VR track-jets to large-R jet collections (here dressing AntiKt10LCTopo with ghost VR-trkjet)
+largeRJetCollections = ["AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets"]
+addVRJets(higg5d1Seq, largeRColls=largeRJetCollections) #Adds the GA VR track-jets with 201810 b-tagging training 
+addVRJets(higg5d1Seq, largeRColls=largeRJetCollections, training='201903') #Adds the VR track-jets with 201903 b-tagging training
+
+
 # Truth containers
 if DerivationFrameworkIsMonteCarlo:
    PHYSSlimmingHelper.AppendToDictionary = {'TruthEvents':'xAOD::TruthEventContainer','TruthEventsAux':'xAOD::TruthEventAuxContainer',
@@ -212,8 +219,9 @@ PHYSSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.T
                                       "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.ConeExclBHadronsFinal.ConeExclCHadronsFinal.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostBHadronsFinal.GhostCHadronsFinal",
                                       "AntiKt4EMPFlowJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.PartonTruthLabelID.DFCommonJets_fJvt.ConeExclBHadronsFinal.ConeExclCHadronsFinal.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostBHadronsFinal.GhostCHadronsFinal",
-                                     "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
-                                     "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
+                                      "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
+                                      "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
+                                      "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.GhostVR30Rmax4Rmin02TrackJet_BTagging201810.GhostVR30Rmax4Rmin02TrackJet_BTagging201903",
                                       "TruthPrimaryVertices.t.x.y.z",
                                       "InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights"]
 
-- 
GitLab


From c265c1ea9cae6ec709f6205fb5f3a51bd58fba3a Mon Sep 17 00:00:00 2001
From: Giuseppe Callea <giuseppe.callea@cern.ch>
Date: Fri, 9 Jul 2021 10:00:47 +0000
Subject: [PATCH 2/2] Updating sequence

---
 .../DerivationFramework/DerivationFrameworkPhys/share/PHYS.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index e46627cfe2ab..e9477adc794d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -176,8 +176,8 @@ PHYSSlimmingHelper.IncludeMinBiasTriggerContent = False
 
 # Adding Ghost-associated VR track-jets to large-R jet collections (here dressing AntiKt10LCTopo with ghost VR-trkjet)
 largeRJetCollections = ["AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets"]
-addVRJets(higg5d1Seq, largeRColls=largeRJetCollections) #Adds the GA VR track-jets with 201810 b-tagging training 
-addVRJets(higg5d1Seq, largeRColls=largeRJetCollections, training='201903') #Adds the VR track-jets with 201903 b-tagging training
+addVRJets(SeqPHYS, largeRColls=largeRJetCollections) #Adds the GA VR track-jets with 201810 b-tagging training 
+addVRJets(SeqPHYS, largeRColls=largeRJetCollections, training='201903') #Adds the VR track-jets with 201903 b-tagging training
 
 
 # Truth containers
-- 
GitLab