From 9007e400d37be0ade416739121aa6eb1310ff1f2 Mon Sep 17 00:00:00 2001
From: Dan Guest <dguest@cern.ch>
Date: Thu, 2 Aug 2018 14:51:38 +0200
Subject: [PATCH] Fix vr jet call in higgs

Former-commit-id: 51adc5736355369bf4a3993584e2d15c2617c042
---
 .../python/HIGG4DxAugmentation.py                   | 13 +------------
 .../DerivationFrameworkHiggs/share/HIGG3D1.py       |  9 ---------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
index 8659e4c93d82..47b389bb3d71 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
@@ -113,18 +113,7 @@ def addVRJetsAndBTagging(HIGG4DxName, sequence):
     from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
     
     # removed for now. Does not work in rel 21 anymore
-    addVRJets(sequence, 
-              "AntiKtVR30Rmax4Rmin02Track", 
-              "GhostVR30Rmax4Rmin02TrackJet", 
-              VRJetAlg="AntiKt", 
-              VRJetRadius=0.4, 
-              VRJetInputs="pv0track", 
-              ghostArea = 0 , 
-              ptmin = 2000, 
-              ptminFilter = 7000, 
-              variableRMinRadius = 0.02, 
-              variableRMassScale = 30000, 
-              calibOpt = "none")
+    addVRJets(sequence)
     
     # Run b-tagging
     from BTagging.BTaggingFlags import BTaggingFlags
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py
index 4ee6512a3be8..270bddd16796 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py
@@ -161,15 +161,6 @@ ToolSvc += HIGG3D1SkimmingTool
 higg3d1Seq = CfgMgr.AthSequencer("HIGG3d1Sequence")
 higg3d1PreSeq = CfgMgr.AthSequencer("HIGG3d1PreSelectionSequence")
 
-#====================================================================
-# Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet
-#====================================================================
-
-#addVRJets(higg3d1Seq, "AntiKtVR30Rmax4Rmin02Track", "GhostVR30Rmax4Rmin02TrackJet",
-#          VRJetAlg="AntiKt", VRJetRadius=0.4, VRJetInputs="pv0track",
-#          ghostArea = 0 , ptmin = 2000, ptminFilter = 7000,
-#          variableRMinRadius = 0.02, variableRMassScale = 30000, calibOpt = "none")
-
 #====================================================================
 # RESTORE JET COLLECTIONS REMOVED BETWEEN r20 AND r21
 #====================================================================
-- 
GitLab