From 585a4f0d6835d7f101a479a86835fddabdbd5435 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 24 Jul 2020 12:42:54 +0200
Subject: [PATCH] TrigL1CaloUpgrade: cmake cleanup, enable flake8
Also move two non-python module files from python/ to share/.
---
.../TrigL1CaloUpgrade/CMakeLists.txt | 29 +++----------------
.../TrigL1CaloUpgrade/python/EFexAlgo.py | 16 +++++-----
.../{python => share}/runEFex.py | 0
.../{python => share}/runEFexFromC.py | 0
4 files changed, 12 insertions(+), 33 deletions(-)
rename Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/{python => share}/runEFex.py (100%)
rename Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/{python => share}/runEFexFromC.py (100%)
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/CMakeLists.txt b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/CMakeLists.txt
index fc2d7bd7b00..c8555df8011 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/CMakeLists.txt
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/CMakeLists.txt
@@ -1,41 +1,20 @@
-################################################################################
-# Package: TrigL1CaloUpgrade
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigL1CaloUpgrade )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- AtlasPolicy
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigL1Calo
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTruth
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArTools
- LArCalorimeter/LArCabling )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core Tree Hist RIO )
# Component(s) in the package:
atlas_add_component( TrigL1CaloUpgrade
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps xAODEgamma xAODTracking xAODTrigCalo xAODTrigL1Calo xAODTrigger xAODTruth LArRawEvent LArToolsLib LArCablingLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CaloDetDescrLib CaloEvent CaloIdentifier GaudiKernel LArCablingLib LArRawEvent StoreGateLib xAODEgamma xAODTracking xAODTrigCalo xAODTrigL1Calo xAODTrigger 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/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/EFexAlgo.py b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/EFexAlgo.py
index d3ec626a242..d48083c40a0 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/EFexAlgo.py
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/EFexAlgo.py
@@ -40,7 +40,7 @@ class EFexAlgo (PyAthena.Alg) :
self.ds = PyAthena.py_svc('DetectorStore')
# getting local singleton instance good enough to
# initialize geometry needed for CaloCells
- dd=ROOT.CaloDetDescrManager.instance()
+ dd=ROOT.CaloDetDescrManager.instance() # noqa: F841
return StatusCode.Success
# takes from input list only cells with et above Trh
@@ -106,7 +106,7 @@ class EFexAlgo (PyAthena.Alg) :
# sums energy in EM cells in list (FCAL not included)
def sumEmCells(self,list):
- TotalSum=0.0;
+ TotalSum=0.0
for cell in list:
if ( cell.caloDDE().getSampling() >=8 ) : continue
TotalSum+=cell.et()
@@ -114,7 +114,7 @@ class EFexAlgo (PyAthena.Alg) :
# sums energy in Had cells in list (FCAL not included)
def sumHadCells(self,list):
- TotalSum=0.0;
+ TotalSum=0.0
for cell in list:
samp = cell.caloDDE().getSampling()
if ( (samp < 8) or (samp>=20) ) : continue
@@ -124,7 +124,7 @@ class EFexAlgo (PyAthena.Alg) :
# sums hadronic energy in TTs in Tile region (lacking from
# SuperCell container
def sumHadTT(self,list):
- TotalSum=0.0;
+ TotalSum=0.0
for TT in list:
print ( "TT explore",TT.eta() , TT.sampling(), TT.pt())
if ( ROOT.TMath.Abs( TT.eta() )>1.72 ) : continue
@@ -183,14 +183,14 @@ class EFexAlgo (PyAthena.Alg) :
def finalize(self):
OutputFile=self.name+".root"
f=ROOT.TFile(OutputFile,'RECREATE')
- h1 = ROOT.TH1F("SCellEt","SCellEt",100,0,20);
- h2 = ROOT.TH2F("SCellEtVsEta","SCellEtVsEta",50,-5.0,5.0,100,0,20);
+ h1 = ROOT.TH1F("SCellEt","SCellEt",100,0,20)
+ h2 = ROOT.TH2F("SCellEtVsEta","SCellEtVsEta",50,-5.0,5.0,100,0,20)
for x in self.ListOfEt:
h1.Fill( x )
for x in self.ListOfEtVsEta:
h2.Fill( x[0],x[1] )
- h1.Write();
- h2.Write();
+ h1.Write()
+ h2.Write()
f.Write()
f.Close()
PyAthena.Alg.finalize(self)
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/runEFex.py b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/share/runEFex.py
similarity index 100%
rename from Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/runEFex.py
rename to Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/share/runEFex.py
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/runEFexFromC.py b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/share/runEFexFromC.py
similarity index 100%
rename from Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/python/runEFexFromC.py
rename to Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/share/runEFexFromC.py
--
GitLab