From a46557a2c6020c20e360013aca8fe7a597fce79d Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Fri, 17 Jul 2020 17:05:14 +0200
Subject: [PATCH] Add flake8 checks for G4Extensions packages + fix any
warnings found
---
.../G4Extensions/Charginos/CMakeLists.txt | 2 +-
.../Charginos/python/CharginosConfig.py | 4 +--
.../ExtraParticles/CMakeLists.txt | 2 +-
.../ExtraParticles/python/PDGParser.py | 3 +--
.../G4CosmicFilter/CMakeLists.txt | 3 +--
.../python/G4CosmicFilterConfig.py | 1 -
.../G4Extensions/G4HitFilter/CMakeLists.txt | 2 +-
.../G4ScoringProcess/CMakeLists.txt | 2 +-
.../G4Extensions/Gauginos/CMakeLists.txt | 2 +-
.../Gauginos/python/GauginosConfig.py | 27 +++++++++----------
.../G4Extensions/Monopole/CMakeLists.txt | 2 +-
Simulation/G4Extensions/Quirks/CMakeLists.txt | 2 +-
.../G4Extensions/Sleptons/CMakeLists.txt | 2 +-
.../Sleptons/python/SleptonsConfig.py | 2 --
14 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/Simulation/G4Extensions/Charginos/CMakeLists.txt b/Simulation/G4Extensions/Charginos/CMakeLists.txt
index b866ccfacf0..4be31ef3441 100644
--- a/Simulation/G4Extensions/Charginos/CMakeLists.txt
+++ b/Simulation/G4Extensions/Charginos/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( Charginos
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
index fd9fb0e31a9..eaa569b12f4 100644
--- a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
+++ b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon import CfgMgr
def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
from G4AtlasApps.SimFlags import simFlags
- from AthenaCommon.SystemOfUnits import GeV,MeV,eplus,ns
+ from AthenaCommon.SystemOfUnits import MeV,ns
C1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Mass", None))
N1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBN1Mass", None))
C1Lifetime = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Lifetime", "-1.0"))
diff --git a/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt b/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
index 79f825bcaf4..27bf93ab287 100644
--- a/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
+++ b/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( ExtraParticles
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py b/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
index f9ad4b63c9a..4de1f36931f 100644
--- a/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
+++ b/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
@@ -27,7 +27,6 @@
"""
import os
-import re
from AthenaCommon.SystemOfUnits import MeV, joule
from AthenaCommon.PhysicalConstants import hbar_Planck, h_Planck
@@ -150,7 +149,7 @@ class PDGParser(object):
self.extraParticles[name] = ExtraParticle(**kwargs)
else:
if getattr(self.extraParticles[name], prop) != -1:
- self.log.warning("Property %s is already set for particle %s. Current value is %s and incoming value is %s." %
+ self.log.warning("Property %s is already set for particle %s. Current value is %s and incoming value is %s." ,
(prop, name, getattr(self.extraParticles[name], prop), value))
continue
setattr(self.extraParticles[name], prop, value)
diff --git a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
index 9d5392cd431..aee29b95595 100644
--- a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
@@ -18,5 +18,4 @@ atlas_add_component( G4CosmicFilter
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth TrackRecordLib )
# Install files from the package:
-atlas_install_headers( G4CosmicFilter )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/G4CosmicFilter/python/G4CosmicFilterConfig.py b/Simulation/G4Extensions/G4CosmicFilter/python/G4CosmicFilterConfig.py
index 52a991fb635..ea33e2c144f 100644
--- a/Simulation/G4Extensions/G4CosmicFilter/python/G4CosmicFilterConfig.py
+++ b/Simulation/G4Extensions/G4CosmicFilter/python/G4CosmicFilterConfig.py
@@ -3,7 +3,6 @@
from __future__ import print_function
from AthenaCommon import CfgMgr
-from G4AtlasApps import PyG4Atlas, AtlasG4Eng
from G4AtlasApps.SimFlags import simFlags
def configCosmicFilterVolumeNames():
diff --git a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
index cbe21dd0548..cc72adde6dd 100644
--- a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
@@ -18,4 +18,4 @@ atlas_add_component( G4HitFilter
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloSimEvent AthenaBaseComps StoreGateLib SGtests LUCID_SimEvent InDetSimEvent LArSimEvent MuonSimEvent G4AtlasInterfaces G4AtlasToolsLib TileSimEvent )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt b/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
index fa4d1e4c4a5..fe2cb5b7937 100644
--- a/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( G4ScoringProcess
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Gauginos/CMakeLists.txt b/Simulation/G4Extensions/Gauginos/CMakeLists.txt
index 591d9dd2f22..6026707080a 100644
--- a/Simulation/G4Extensions/Gauginos/CMakeLists.txt
+++ b/Simulation/G4Extensions/Gauginos/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( Gauginos
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
index 25e64ea1ec9..8dca17479cb 100644
--- a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
+++ b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
@@ -2,27 +2,26 @@
from AthenaCommon import CfgMgr
def getGauginosPhysicsTool(name="GauginosPhysicsTool", **kwargs):
- from AthenaCommon.SystemOfUnits import GeV,MeV,eplus,ns
from G4AtlasApps.SimFlags import simFlags
GMSBNeutralino = eval(simFlags.specialConfiguration.get_Value().get("GMSBNeutralino", "0*GeV"))
GMSBTime = eval(simFlags.specialConfiguration.get_Value().get("GMSBLifeTime", "0*GeV"))
kwargs.setdefault("NeutralinoMass", GMSBNeutralino)
- ##kwargs.setdefault("NeutralinoWidth", 0.0*GeV);
- ##kwargs.setdefault("NeutralinoCharge", 0);
- ##kwargs.setdefault("NeutralinoPDGCode", 1000039);
- kwargs.setdefault("NeutralinoStable", False);
- kwargs.setdefault("NeutralinoLifetime", GMSBTime);
- ##kwargs.setdefault("NeutralinoShortlived", False);
+ ##kwargs.setdefault("NeutralinoWidth", 0.0*GeV)
+ ##kwargs.setdefault("NeutralinoCharge", 0)
+ ##kwargs.setdefault("NeutralinoPDGCode", 1000039)
+ kwargs.setdefault("NeutralinoStable", False)
+ kwargs.setdefault("NeutralinoLifetime", GMSBTime)
+ ##kwargs.setdefault("NeutralinoShortlived", False)
if "GMSBGravitino" in simFlags.specialConfiguration.get_Value():
GMSBGravitino = eval(simFlags.specialConfiguration.get_Value().get("GMSBGravitino", "0*GeV"))
- kwargs.setdefault("GravitinoMass", GMSBGravitino);
- ##kwargs.setdefault("GravitinoWidth", 0.0*GeV);
- ##kwargs.setdefault("GravitinoCharge", 0);
- ##kwargs.setdefault("GravitinoPDGCode", 1000022);
- ##kwargs.setdefault("GravitinoStable", True);
- ##kwargs.setdefault("GravitinoLifetime", -1);
- ##kwargs.setdefault("GravitinoShortlived", False);
+ kwargs.setdefault("GravitinoMass", GMSBGravitino)
+ ##kwargs.setdefault("GravitinoWidth", 0.0*GeV)
+ ##kwargs.setdefault("GravitinoCharge", 0)
+ ##kwargs.setdefault("GravitinoPDGCode", 1000022)
+ ##kwargs.setdefault("GravitinoStable", True)
+ ##kwargs.setdefault("GravitinoLifetime", -1)
+ ##kwargs.setdefault("GravitinoShortlived", False)
return CfgMgr.GauginosPhysicsTool(name, **kwargs)
diff --git a/Simulation/G4Extensions/Monopole/CMakeLists.txt b/Simulation/G4Extensions/Monopole/CMakeLists.txt
index 7eacc7123cd..48d05372ec5 100644
--- a/Simulation/G4Extensions/Monopole/CMakeLists.txt
+++ b/Simulation/G4Extensions/Monopole/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( Monopole
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Quirks/CMakeLists.txt b/Simulation/G4Extensions/Quirks/CMakeLists.txt
index 99dd3e5c633..1fe833e4f4b 100644
--- a/Simulation/G4Extensions/Quirks/CMakeLists.txt
+++ b/Simulation/G4Extensions/Quirks/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( Quirks
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces G4AtlasToolsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Sleptons/CMakeLists.txt b/Simulation/G4Extensions/Sleptons/CMakeLists.txt
index 2646be52192..d1a1553edf4 100644
--- a/Simulation/G4Extensions/Sleptons/CMakeLists.txt
+++ b/Simulation/G4Extensions/Sleptons/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_component( Sleptons
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py b/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
index 2f3c4a8de85..7e3944555d5 100644
--- a/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
+++ b/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
@@ -15,7 +15,6 @@ where Particle = [STau1Minus, STau1Plus, STau2Minus, STau2Plus, SElectronRMinus,
"""
def getSleptonsPhysicsTool(name="SleptonsPhysicsTool", **kwargs):
from G4AtlasApps.SimFlags import simFlags
- from AthenaCommon.SystemOfUnits import GeV,MeV,eplus,ns
GMSBStau = eval(simFlags.specialConfiguration.get_Value().get("GMSBStau", None))
kwargs.setdefault("G4STau1MinusMass", GMSBStau)
kwargs.setdefault("G4STau1PlusMass", GMSBStau)
@@ -32,7 +31,6 @@ def getSleptonsPhysicsTool(name="SleptonsPhysicsTool", **kwargs):
def getAllSleptonsPhysicsTool(name="AllSleptonsPhysicsTool", **kwargs):
from G4AtlasApps.SimFlags import simFlags
- from AthenaCommon.SystemOfUnits import GeV,MeV,eplus,ns
if "GMSBStau" in simFlags.specialConfiguration.get_Value():
GMSBStau = eval(simFlags.specialConfiguration.get_Value().get("GMSBStau", None))
GMSBStauTime = eval(simFlags.specialConfiguration.get_Value().get("GMSBStauTime", None))
--
GitLab