diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/CMakeLists.txt
index 85da10191b61be3601524c0a49b650b4424f18d2..41f22685aef49cd0444c4f83f93469d1742589d2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/CMakeLists.txt
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/CMakeLists.txt
@@ -9,5 +9,5 @@ atlas_add_component( DerivationFrameworkTop
LINK_LIBRARIES AthenaBaseComps DerivationFrameworkInterfaces ExpressionEvaluationLib GaudiKernel StoreGateLib xAODBTagging xAODEventInfo xAODJet xAODTracking xAODTruth )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonJets.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonJets.py
index dc48423a9685daf416bd6fa57f7a84c9ed57eb56..733bedfdba6c62fb70d25f75073acf54679ff532 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonJets.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonJets.py
@@ -9,12 +9,10 @@
# DerivationFrameworkTop.TOPQCommonJets.TOPQupdateJVT("JetCollection")
#===================================================================================
-from __future__ import print_function
-
#========
# IMPORTS
#========
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
+from AthenaCommon import CfgMgr
from AthenaCommon.GlobalFlags import globalflags
from RecExConfig.ObjKeyStore import cfgKeyStore
@@ -99,6 +97,7 @@ def addStandardJetsForTop(algseq, outputGroup):
#==================
# PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/trunk/python/ExtendedJetCommon.py
def buildTOPQCA15jets(algseq):
+ from JetRec.JetRecStandard import jtm
if not cfgKeyStore.isInInput("xAOD::JetContainer","CamKt15LCTopoJets"):
from JetRec.JetRecConf import JetAlgorithm
jtm.modifiersMap["lctopoCA15"] = list(jtm.modifiersMap["lctopo"])
@@ -123,7 +122,7 @@ def applyTOPQJetCalibration(jetcollection, algseq=None):
applyJetCalibration_xAODColl, applyJetCalibration_CustomColl
supportedJets = ['AntiKt4EMTopo', 'AntiKt10LCTopoTrimmedPtFrac5SmallR20']
- if not jetcollection in supportedJets:
+ if jetcollection not in supportedJets:
print ("TOPQCommonJets:",jetcollection, "is an unsupported collection for calibration!")
return
elif jetcollection == 'AntiKt4EMTopo':
@@ -140,7 +139,7 @@ def TOPQupdateJVT(jetcollection, algseq=None):
from DerivationFrameworkJetEtMiss.ExtendedJetCommon import updateJVT_xAODColl
supportedJets = ['AntiKt4EMTopo']
- if not jetcollection in supportedJets:
+ if jetcollection not in supportedJets:
print ("TOPQCommonJets:", jetcollection, "is an unsupported collection for JVT augmentation!")
return
else:
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSelection.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSelection.py
index 0cde41ad846e51aad891065594c3151bda5305ce..21e126a3c71a20209243daa141bdea6837fc098f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSelection.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSelection.py
@@ -8,8 +8,6 @@
# skimmingTools_jet = DerivationFrameworkTop.TOPQCommonSelection.setup_jet('TOPQ1', ToolSvc)
#====================================================================
-from __future__ import print_function
-
#================================
# SKIMMING SELECTIONS
#================================
@@ -43,7 +41,7 @@ from __future__ import print_function
#================================
# IMPORTS
#================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
+import DerivationFrameworkCore.DerivationFrameworkMaster # noqa: F401
#================
# ELECTRONS
@@ -105,9 +103,9 @@ def setup_lep(TOPQname, ToolSvc):
elif TOPQname == 'TOPQ2':
TOPQ2_LEP10 = "( (count("+EL10+") >= 2) || (count("+MU10+") >= 2) || (count("+EL10+")>= 1 && count("+MU10+") >= 1) )"
TOPQ2_LEP15 = "( (count("+EL15+") >= 2) || (count("+MU15+") >= 2) || (count("+EL15+")>= 1 && count("+MU15+") >= 1) )"
- TOPQ2_LEP17 = "( (count("+EL17+") >= 2) || (count("+MU17+") >= 2) || (count("+EL17+")>= 1 && count("+MU17+") >= 1) )"
+ TOPQ2_LEP17 = "( (count("+EL17+") >= 2) || (count("+MU17+") >= 2) || (count("+EL17+")>= 1 && count("+MU17+") >= 1) )" # noqa: F841 (FIXME, not used)
TOPQ2_LEP20 = "( (count("+EL20+") >= 1) || (count("+MU20+") >= 1) )"
- TOPQ2_LEP22 = "( (count("+EL22+") >= 1) || (count("+MU22+") >= 1) )"
+ TOPQ2_LEP22 = "( (count("+EL22+") >= 1) || (count("+MU22+") >= 1) )" # noqa: F841 (FIXME, not used)
TOPQ_Selection_lep = "( ("+TOPQ2_LEP15+") || (("+TOPQ2_LEP10+") && ("+TOPQ2_LEP20+")) )"
elif TOPQname == 'TOPQ3':
TOPQ_Selection_lep = "( (count("+MU13+") >= 1) || (count("+EL13+") >= 1) )"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSlimming.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSlimming.py
index f8a6f7a2534d478fdf4a435640cd0013edb24bed..23d3000091e435ee911398b1e2f0bec465e2d695 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSlimming.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonSlimming.py
@@ -7,16 +7,14 @@
# DerivationFrameworkTop.TOPQCommonSlimming.setup('TOPQX', TOPQStream)
#====================================================================
-from __future__ import print_function
-
#================================
# IMPORTS
#================================
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from AthenaCommon.GlobalFlags import globalflags
-from DerivationFrameworkTop.TOPQCommonExtraContent import *
-from DerivationFrameworkJetEtMiss.METCommon import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
+import DerivationFrameworkTop.TOPQCommonExtraContent as tec
+from DerivationFrameworkJetEtMiss.METCommon import addMETOutputs
+from DerivationFrameworkJetEtMiss.JetCommon import addJetOutputs
import JetTagNonPromptLepton.JetTagNonPromptLeptonConfig as Config
@@ -34,7 +32,7 @@ def setup(TOPQname, stream):
# SMART SLIMMING
#================================
TOPQSlimmingHelper.SmartCollections = []
- TOPQSlimmingHelper.SmartCollections += TOPQSmartSlimmingCollections
+ TOPQSlimmingHelper.SmartCollections += tec.TOPQSmartSlimmingCollections
print ("TOPQSlimmingHelper.SmartCollections: " , TOPQSlimmingHelper.SmartCollections)
@@ -42,27 +40,27 @@ def setup(TOPQname, stream):
# EXTRA VARIABLES FROM DerivationFrameworkTop.TOPQCommonExtraContent
#=================================================================
TOPQSlimmingHelper.ExtraVariables = []
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesAntiKt4EMTopoJets
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesAntiKt4EMPFlowJets
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesBTagging_AntiKt4EMPFlow
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesBTagging_AntiKt4EMTopo
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesPhotons
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesElectrons
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesMuons
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesTaus
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesTrackJets
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesAntiKt4EMTopoJets
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesAntiKt4EMPFlowJets
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesBTagging_AntiKt4EMPFlow
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesBTagging_AntiKt4EMTopo
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesPhotons
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesElectrons
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesMuons
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesTaus
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesTrackJets
TOPQSlimmingHelper.ExtraVariables += Config.GetExtraPromptVariablesForDxAOD()
# TOPQSlimmingHelper.ExtraVariables += ["CaloCalTopoClusters.calE.calEta.calPhi.calM.rawM.rawE.rawEta.rawPhi.e_sampl.eta_sampl.etaCalo.phiCalo"]
TOPQSlimmingHelper.ExtraVariables += ["CaloCalTopoClusters.calPt.calEta.calPhi.calM.calE.CENTER_MAG"]
if DFisMC:
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesPhotonsTruth
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesElectronsTruth
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesMuonsTruth
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVariablesTausTruth
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVarsBTag_HLT_Container
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVarsJet_EF_Container
- TOPQSlimmingHelper.ExtraVariables += TOPQExtraVarsJet_Split_Container
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesPhotonsTruth
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesElectronsTruth
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesMuonsTruth
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVariablesTausTruth
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVarsBTag_HLT_Container
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVarsJet_EF_Container
+ TOPQSlimmingHelper.ExtraVariables += tec.TOPQExtraVarsJet_Split_Container
print ("TOPQSlimmingHelper.ExtraVariables: " , TOPQSlimmingHelper.ExtraVariables)
@@ -70,11 +68,11 @@ def setup(TOPQname, stream):
# EXTRA COLLECTIONS - user added
#================================
TOPQSlimmingHelper.AllVariables = []
- TOPQSlimmingHelper.AllVariables += TOPQExtraContainersStandard
- TOPQSlimmingHelper.AllVariables += TOPQExtraContainersTrigger
+ TOPQSlimmingHelper.AllVariables += tec.TOPQExtraContainersStandard
+ TOPQSlimmingHelper.AllVariables += tec.TOPQExtraContainersTrigger
if DFisMC:
- TOPQSlimmingHelper.AllVariables += TOPQExtraContainersTruth
+ TOPQSlimmingHelper.AllVariables += tec.TOPQExtraContainersTruth
print ("TOPQSlimmingHelper.AllVariables: " , TOPQSlimmingHelper.AllVariables)
@@ -82,10 +80,10 @@ def setup(TOPQname, stream):
# CREATED ON-THE-FLY COLLECTIONS
#================================
TOPQSlimmingHelper.StaticContent = []
- TOPQSlimmingHelper.StaticContent += TOPQStaticContent
+ TOPQSlimmingHelper.StaticContent += tec.TOPQStaticContent
if DFisMC:
- TOPQSlimmingHelper.StaticContent += TOPQStaticContentTruth
+ TOPQSlimmingHelper.StaticContent += tec.TOPQStaticContentTruth
print ("TOPQSlimmingHelper.StaticContent: " , TOPQSlimmingHelper.StaticContent)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py
index 2b09791d3fe420340aae462e756ca0b655a5c9c7..7e26d7944225b1dae9943e75c767a4e99dcf5081 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py
@@ -19,8 +19,6 @@
# * GenericTruthThinning (fine-grained thinning)
#====================================================================
-from __future__ import print_function
-
#============================
# Define trigger chain output
#============================
@@ -54,13 +52,13 @@ def setup(TOPQname, streamName, ToolSvc):
# Track Particle Thinning !!! BUGGY (yes, that's a technical term)...CURRENTLY NOT USING !!!
#========================
# PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/trunk/src/TrackParticleThinning.cxx
- thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)"
- from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning
- TOPQTPThinningTool = DerivationFramework__TrackParticleThinning(
- name = TOPQname + "TPThinningTool",
- StreamName = streamName,
- SelectionString = thinning_expression,
- InDetTrackParticlesKey = "InDetTrackParticles")
+ #thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)"
+ #from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning
+ #TOPQTPThinningTool = DerivationFramework__TrackParticleThinning(
+ # name = TOPQname + "TPThinningTool",
+ # StreamName = streamName,
+ # SelectionString = thinning_expression,
+ # InDetTrackParticlesKey = "InDetTrackParticles")
#ToolSvc += TOPQTPThinningTool
#thinningTools.append(TOPQTPThinningTool)
@@ -259,7 +257,6 @@ def setup(TOPQname, streamName, ToolSvc):
# we remove photons below 9GeV
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
- pTPhotonVariableToCutOn = ".pt"
photonColl = "Photons"
TOPQPhotonThinning = DerivationFramework__GenericObjectThinning(
name = TOPQname + photonColl + "Thinning_lowpTphotons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonTruthTools.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonTruthTools.py
index e3fe9f5189a56a80bb75fc52f8501efd0a0286b0..6df910529db278a08c1b916779b4f0089e305bcf 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonTruthTools.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonTruthTools.py
@@ -7,13 +7,14 @@
# TOPQXSequence += TOPQCommonTruthKernel
#====================================================================
-from __future__ import print_function
-
#================================
# IMPORTS
#================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkMCTruth.HFHadronsCommon import *
+from AthenaCommon import CfgMgr
+from AthenaCommon.AppMgr import ToolSvc
+
+from DerivationFrameworkMCTruth.HFHadronsCommon import DSIDList
+
def setup(ToolSvc):
@@ -47,7 +48,6 @@ def setup(ToolSvc):
#==============================================================================
# PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/trunk/src/TruthCollectionMaker.cxx
# PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/trunk/src/TruthCollectionMakerTau.cxx
- from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMaker
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMakerTau
#==========
@@ -174,7 +174,7 @@ TOPQCommonTruthKernel = CfgMgr.DerivationFramework__CommonAugmentation("TOPQComm
#==============================================================================
# Add SumOfWeights metadata for LHE3 multiweights: TOPQDERIV-21
#==============================================================================
-import DerivationFrameworkCore.LHE3WeightMetadata
+import DerivationFrameworkCore.LHE3WeightMetadata # noqa: F401
# #==============================================================================
# # HIGGS TEMPLATE XSECTION augmentation