From 6f25c94dc46b266da64fdfc45d34ac0cb221f7d2 Mon Sep 17 00:00:00 2001
From: Albert Kong <albert.xing.yi.kong@cern.ch>
Date: Mon, 1 Nov 2021 21:25:32 +1030
Subject: [PATCH] Replace 'import *' statements with specific imports

---
 .../DerivationFrameworkJetEtMiss/share/JETM10.py      |  5 +----
 .../DerivationFrameworkJetEtMiss/share/JETM11.py      |  7 +------
 .../DerivationFrameworkJetEtMiss/share/JETM12.py      | 10 +++-------
 .../DerivationFrameworkJetEtMiss/share/JETM14.py      |  7 +------
 .../DerivationFrameworkJetEtMiss/share/JETM15.py      |  9 +++++----
 .../DerivationFrameworkJetEtMiss/share/JETM4.py       |  8 ++++++++
 .../DerivationFrameworkJetEtMiss/share/JETM5.py       |  8 ++++----
 .../DerivationFrameworkJetEtMiss/share/JETM6.py       |  2 +-
 .../DerivationFrameworkJetEtMiss/share/JETM8.py       | 11 ++++++-----
 .../DerivationFrameworkJetEtMiss/share/JETM9.py       |  7 ++++---
 10 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py
index a26e1625ddd2..c730098a598d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py
@@ -2,10 +2,7 @@
 # JETM10.py 
 # reductionConf flag JETM10 in Reco_tf.py   
 #====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName
 from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager
 
 #======================================================================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
index 1dccd7f1c1a4..5fe5e7966a01 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
@@ -2,13 +2,8 @@
 # JETM11.py 
 # reductionConf flag JETM11 in Reco_tf.py   
 #====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName
 from DerivationFrameworkJetEtMiss import TriggerLists
-from DerivationFrameworkEGamma.EGammaCommon import*
-from DerivationFrameworkMuons.MuonsCommon import*
 from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager
 
 #======================================================================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py
index b3a0f82e411d..844e58a68fe0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py
@@ -3,13 +3,9 @@
 # reductionConf flag JETM12 in Reco_tf.py   
 #====================================================================
 
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkInDet.InDetCommon import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkEGamma.EGammaCommon import *
-from DerivationFrameworkMuons.MuonsCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo,
+DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
 #
 
 #====================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py
index 0d7e60d63616..65e7db6c7d1b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py
@@ -2,13 +2,8 @@
 # JETM14.py 
 # reductionConf flag JETM14 in Reco_tf.py   
 #====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName
 from DerivationFrameworkJetEtMiss import TriggerLists
-from DerivationFrameworkEGamma.EGammaCommon import*
-from DerivationFrameworkMuons.MuonsCommon import*
 from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager
 
 #======================================================================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py
index 944ff38146d9..e706c526cab4 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py
@@ -3,13 +3,14 @@
 # reductionConf flag JETM15 in Reco_tf.py
 #====================================================================
 
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo,
+DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import addJetOutputs, addStandardJets
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addDefaultTrimmedJets, addConstModJets, addConstModJets, addTCCTrimmedJets, addOriginCorrectedClusters
 from DerivationFrameworkEGamma.EGammaCommon import *
 from DerivationFrameworkMuons.MuonsCommon import *
 from DerivationFrameworkJetEtMiss.METCommon import *
-from DerivationFrameworkFlavourTag.HbbCommon import *
+from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
 #
 if DerivationFrameworkIsMonteCarlo:
   from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
index 2d3487cc0360..28a1fe57232a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
@@ -161,6 +161,14 @@ addDefaultTrimmedJets(jetm4Seq,"JETM4")
 from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation
 applyPFOAugmentation(DerivationFrameworkJob)
 
+#===================================================
+#add variable-R track jets for b-tagging
+#===================================================
+
+from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
+addVRJets(jetm4Seq,largeRColls=largeRJetCollections)
+addVRJets(jetm4Seq,largeRColls=largeRJetCollections, training='201903')
+
 #=======================================
 # SCHEDULE CUSTOM MET RECONSTRUCTION
 #=======================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py
index 742701a41f39..b9e544a849bb 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py
@@ -3,10 +3,10 @@
 # reductionConf flag JETM5 in Reco_tf.py   
 #====================================================================
 
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob,
+buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import addJetOutputs
+from DerivationFrameworkJetEtMiss.METCommon import addMETOutputs
 
 #====================================================================
 # SET UP STREAM   
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
index 7a4bce7012f1..f383e5581935 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
@@ -10,7 +10,7 @@ from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
 #from DerivationFrameworkEGamma.EGammaCommon import *
 #from DerivationFrameworkMuons.MuonsCommon import *
 
-#from DerivationFrameworkFlavourTag.HbbCommon import *
+from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
 
 #from DerivationFrameworkJetEtMiss.METCommon import *
 
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py
index d665c01aa80f..263b91fd9b41 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py
@@ -3,11 +3,12 @@
 # reductionConf flag JETM8 in Reco_tf.py   
 #====================================================================
 
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkFlavourTag.HbbCommon import *
-from DerivationFrameworkFlavourTag.FlavourTagCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo,
+DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs
+#from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
+#from DerivationFrameworkFlavourTag.FlavourTagCommon import *
 
 #====================================================================
 # SKIMMING TOOL 
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py
index ee8b7e5dfc3f..f712a4a3e743 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py
@@ -3,9 +3,10 @@
 # reductionConf flag JETM9 in Reco_tf.py   
 #====================================================================
 
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo,
+DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addRscanJets
 #from DerivationFrameworkJetEtMiss.METCommon import *
 
 #====================================================================
-- 
GitLab