diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
index ca934cff01a7ee05d89b63379f6f30281b0ce644..bca00e3c2a1cb74676cd2fff1f8cd8903c58fa96 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
@@ -1,32 +1,8 @@
-################################################################################
-# Package: CaloD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Control/AthContainers
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/SGTools
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- LArCalorimeter/LArRecEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/PrimaryDPDMaker
- TileCalorimeter/TileEvent
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
find_package( CLHEP )
@@ -34,7 +10,7 @@ find_package( CLHEP )
atlas_add_component( CaloD3PDMaker
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel SGTools Identifier xAODCaloEvent GaudiKernel LArRecEvent D3PDMakerUtils PrimaryDPDMakerLib TileEvent TileIdentifier )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloInterfaceLib CaloEvent CaloIdentifier CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel xAODCaloEvent GaudiKernel LArRecEvent D3PDMakerUtils PrimaryDPDMakerLib TileEvent TileIdentifier )
# 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/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
index 897800d3529291c9b59143470a40917788e27166..f4f0e8af5cf90defb7508311a740ef5c1177450b 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
@@ -1,11 +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
import CaloD3PDMaker
import D3PDMakerCoreComps
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from CaloD3PDMaker import CaloD3PDMakerConf
from CaloIdentifier import SUBCALO
from CaloD3PDMaker.makeCaloCellFilterAlg import makeCaloCellFilterAlg
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -20,8 +18,8 @@ prefix_to_det["cc_tile_"] = [SUBCALO.TILE]
def makeCellD3PDObject (name, prefix, object_name, getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'AllCalo'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'AllCalo'
+ if label is None: label = prefix
if prefix in prefix_to_det.keys():
sgkey = prefix
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
index 504541e83e039acdd0541eb78f55b5167c3b1514..0ad5aaffbe9556146a2043829f8a3d5dbac7323a 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
# @author scott snyder <snyder@bnl.gov>
@@ -9,7 +8,6 @@
#
-import CaloD3PDMaker
import EventCommonD3PDMaker
from CaloD3PDMaker.CollisionDecisionGetter import CollisionDecisionGetter
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
index 5a3754d0c99d8cc8c658117d96ad3b23eba99b14..ff9b229c5c0e937deb24135cf9f3b33c95942d1c 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# $Id$
#
@@ -70,7 +70,7 @@ class CollisionDecisionGetter ( Configured ) :
self._handle = skimmer
- except:
+ except Exception:
mlog.error ("Error configuring LArCollisionTimeAlg.")
traceback.print_exc()
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
index ebe7181ae57c2b8b69e246e7b5f82823904a5afb..ecdd52b57e2e87d440e5d7ba6ad298dbf0770efc 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file CaloD3PDMaker/python/CollisionFilterAlg.py
# @author scott snyder <snyder@bnl.gov>
@@ -42,8 +41,8 @@ class CollisionFilterAlg (PyAthena.Alg):
sdc = self.sg.retrieve( "SkimDecisionCollection",
self.SkimDecisionsContainerName )
passed = False
- if sdc == None:
- self.msg.error ("Can't find SkimDecisionCollection " +
+ if sdc is None:
+ self.msg.error ("Can't find SkimDecisionCollection %s",
self.SkimDecisionsContainerName)
else:
for sd in sdc:
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
index 754f34e671c7bdcf244bfd386dc85570f5e11c09..925caf48fb318c32a495a577d9d9007eb547e797 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file CaloD3PDMaker/python/MBTSD3PDObject.py
# @author scott snyder <snyder@bnl.gov>
@@ -13,7 +12,7 @@
# setup (that doesn't use GeoModelSvc).
from AthenaCommon.AppMgr import ServiceMgr
if not hasattr (ServiceMgr, 'DetDescrCnvSvc'):
- import DetDescrCnvSvc.DetStoreConfig
+ import DetDescrCnvSvc.DetStoreConfig # noqa: F401
ServiceMgr.DetDescrCnvSvc.DoInitNeighbours = False
import CaloD3PDMaker
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
index 850b63d4f71dffe2acc8cd506798d5973544633e..b0e3bbccfb4459c7d389b28da6547fee1f9754e4 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
@@ -1,7 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from CaloIdentifier import SUBCALO
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
def makeTileCellFilterAlg( CellsName = "AllCalo",
OutputCellsName="SelectedCells",
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/CMakeLists.txt
index d8aabaf4679a442bc26e17a8a9076340d8512680..bd6358426833ddeb7f4cfef4e1f7cc7625836053 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/CMakeLists.txt
@@ -1,55 +1,15 @@
-################################################################################
-# Package: CaloSysD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSysD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloDmDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloSimEvent
- Calorimeter/CaloUtils
- Control/AthContainers
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/StoreGate
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArRecEvent
- LArCalorimeter/LArSimEvent
- LArCalorimeter/LArCabling
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/PrimaryDPDMaker
- Reconstruction/Jet/JetEvent
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- TileCalorimeter/TileIdentifier
- TileCalorimeter/TileSimEvent )
-
-# External dependencies:
-find_package( CLHEP )
-
# Component(s) in the package:
atlas_add_component( CaloSysD3PDMaker
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel Navigation StoreGateLib SGtests Identifier xAODCaloEvent GaudiKernel LArIdentifier LArRawEvent LArRecEvent LArSimEvent LArCablingLib D3PDMakerUtils PrimaryDPDMakerLib JetEvent TileConditionsLib TileEvent TileIdentifier TileSimEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent D3PDMakerUtils GaudiKernel Identifier LArCablingLib LArElecCalib LArIdentifier LArRawEvent LArRecEvent LArSimEvent StoreGateLib TileConditionsLib TileEvent TileIdentifier TileSimEvent )
# 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/D3PDMaker/CaloSysD3PDMaker/python/CaloCalibHitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloCalibHitD3PDObject.py
index 98c2d94883066138b53a9fc4d0dc0a50dbb6931d..ee97373a60e45489d1acc48225e76842932e5b8f 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloCalibHitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloCalibHitD3PDObject.py
@@ -10,8 +10,8 @@ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
def makeD3PDObject (name, prefix, object_name, getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = "LArCalibrationHitActive"
- if label == None: label = prefix
+ if sgkey is None: sgkey = "LArCalibrationHitActive"
+ if label is None: label = prefix
if prefix=="laract_" :
sgkey = "LArCalibrationHitActive"
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloHitD3PD.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloHitD3PD.py
index a881f7c5b70e294dcc88ce3516d0a483fef32fe9..f3226afd987c344696f18238dd306e77e957407b 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloHitD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/CaloHitD3PD.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# @file CaloSysD3PDMaker/python/CaloHitD3PD.py
@@ -11,10 +11,8 @@
from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
from CaloSysD3PDMaker.LArHitD3PDObject import LArHitEMBD3PDObject, LArHitEMECD3PDObject, LArHitHECD3PDObject, LArHitFCALD3PDObject
from CaloSysD3PDMaker.TileHitD3PDObject import TileHitD3PDObject, MBTSHitD3PDObject
-from CaloSysD3PDMaker.CaloCalibHitD3PDObject import LArActiveCaloCalibHitD3PDObject, LArInactiveCaloCalibHitD3PDObject, LArDMCaloCalibHitD3PDObject, TileCaloCalibHitD3PDObject, TileDMCaloCalibHitD3PDObject, TileDMOCaloCalibHitD3PDObject,TileActiveCaloCalibHitD3PDObject, TileInactiveCaloCalibHitD3PDObject, TileDMCaloCalibHitD3PDObject
+from CaloSysD3PDMaker.CaloCalibHitD3PDObject import LArActiveCaloCalibHitD3PDObject, LArInactiveCaloCalibHitD3PDObject, LArDMCaloCalibHitD3PDObject, TileCaloCalibHitD3PDObject, TileDMCaloCalibHitD3PDObject, TileDMOCaloCalibHitD3PDObject,TileActiveCaloCalibHitD3PDObject, TileInactiveCaloCalibHitD3PDObject
from D3PDMakerCoreComps.resolveSGKey import testSGKey
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-import CaloD3PDMaker
def CaloHitD3PD (alg = None,
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterD3PDObject.py
index 8ad1ffcad8da0d74f714267cea9b23f309a20b3b..62a642648a114c5dfafca862a97f765b2a45ea95 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterD3PDObject.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import CaloD3PDMaker
import CaloSysD3PDMaker
-import D3PDMakerCoreComps
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterMomentFillerTool.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterMomentFillerTool.py
index 28da4cd3e1188ced17ff90c9163426a025591d7b..5c2e705f406a13a0d4933531a318415c3c685cb3 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterMomentFillerTool.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/ClusterMomentFillerTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# @file CaloSysD3PDMaker/python/ClusterMomentFillerTool.py
@@ -52,26 +52,26 @@ class ClusterMomentFillerTool (CaloSysD3PDMakerConf.D3PD__ClusterMomentFillerToo
NVERTEX_FRACTION = 1001 #**< slightly updated vertex fraction more pile up independent (similar to nJVF) */
ENG_CALIB_TOT = 10001 #**< Calibration Hit energy inside the cluster.
ENG_CALIB_OUT_L = 10010 #**< Attached Calibration Hit energy
- # outside clusters but inside the calorimeter
- # with loose matching (Angle < 1.0)
- # */
+ # outside clusters but inside the calorimeter
+ # with loose matching (Angle < 1.0)
+ # */
ENG_CALIB_OUT_M = 10011 #**< Attached Calibration Hit energy
- # outside clusters but inside the
- # calorimeter with medium matching
- # (Angle < 0.5). */
+ # outside clusters but inside the
+ # calorimeter with medium matching
+ # (Angle < 0.5). */
ENG_CALIB_OUT_T = 10012 #**< Attached Calibration Hit energy
- # outside clusters but inside the
- # calorimeter with tight matching
- # (Angle < 0.3). */
+ # outside clusters but inside the
+ # calorimeter with tight matching
+ # (Angle < 0.3). */
ENG_CALIB_DEAD_L = 10020 #**< Attached Calibration Hit energy in
- # dead material with loose matching
- # (Angle < 1.0). */
+ # dead material with loose matching
+ # (Angle < 1.0). */
ENG_CALIB_DEAD_M = 10021 #**< Attached Calibration Hit energy in
- # dead material with medium matching
- # (Angle < 0.5). */
+ # dead material with medium matching
+ # (Angle < 0.5). */
ENG_CALIB_DEAD_T = 10022 #**< Attached Calibration Hit energy in
- # dead material with tight matching
- # (Angle < 0.3). */
+ # dead material with tight matching
+ # (Angle < 0.3). */
ENG_CALIB_EMB0 = 10030 #**< Calibration Hit energy inside the cluster barrel presampler. */
ENG_CALIB_EME0 = 10031 #**< Calibration Hit energy inside the cluster endcap presampler. */
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/EMClusterD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/EMClusterD3PDObject.py
index 08a3e7150299652e83a154b9cdbd66bb2b1542f0..3d59b192b6dafaa0a05f4cd5d7dabdc812e57b13 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/EMClusterD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/EMClusterD3PDObject.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import CaloD3PDMaker
import CaloSysD3PDMaker
-import D3PDMakerCoreComps
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArHitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArHitD3PDObject.py
index 16c79e2a9c3b296f5a6d6222d084a27eba536c0a..f7b8686c4be589802f16834f9aac59ba3497b66d 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArHitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArHitD3PDObject.py
@@ -10,8 +10,8 @@ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
def makeD3PDObject (name, prefix, object_name, getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = "LArHits"
- if label == None: label = prefix
+ if sgkey is None: sgkey = "LArHits"
+ if label is None: label = prefix
if prefix=="hitemb_" :
sgkey = "LArHitEMB"
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArNoisyROD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArNoisyROD3PDObject.py
index f6128e685841196cd31088d86ceb336f28808f42..f2ebc2fba94f1462e3c425de29b6507fcf800cf4 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArNoisyROD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArNoisyROD3PDObject.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file CaloSysD3PDMaker/python/LArNoisROD3PDObject.py
# @author Laurent Duflot <duflot at lal.in2p3.fr>
@@ -10,9 +9,7 @@
import CaloSysD3PDMaker
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-from RecExConfig.ObjKeyStore import cfgKeyStore
LArNoisyROD3PDObject = \
make_SG_D3PDObject ('LArNoisyROSummary',
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArRawChannelD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArRawChannelD3PDObject.py
index 1db71aa38420ef5ac85ccabcf0a0c8195b4613be..b56faabef6e08def031c0694979090fb2345770c 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArRawChannelD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArRawChannelD3PDObject.py
@@ -1,6 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import CaloSysD3PDMaker
import D3PDMakerCoreComps
@@ -12,8 +10,8 @@ LArRawChannelSGKey='LArRawChannels'
def makeLArRawChannelD3PDObject (name, prefix, object_name='LArRawChannelD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = LArRawChannelSGKey
- if label == None: label = prefix
+ if sgkey is None: sgkey = LArRawChannelSGKey
+ if label is None: label = prefix
if not getter:
getter = CaloSysD3PDMaker.LArRawChannelContainerGetterTool(name + '_Getter',
@@ -21,7 +19,6 @@ def makeLArRawChannelD3PDObject (name, prefix, object_name='LArRawChannelD3PDObj
SGKey = LArRawChannelSGKey)
# create the selected cells
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
return D3PDMakerCoreComps.VectorFillerTool (name,
Prefix = prefix,
Getter = getter,
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArSCHitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArSCHitD3PDObject.py
index d384a1347c3b363a4ddc7c990aa750d232a18a02..cb9908210d3d56ede46679bfcccc919d27b5b63e 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArSCHitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/LArSCHitD3PDObject.py
@@ -3,8 +3,6 @@
import CaloSysD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.D3PDObject import (make_SG_D3PDObject, make_SGDataVector_D3PDObject)
-from math import pi
def _hookForLArSCHitD3PDObject_(c, *arg, **kw ):
@@ -31,18 +29,19 @@ def _makeLArSCHit_obj_(name, prefix, object_name,
sgKey=None,
typeName=None,
):
+
+ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
if not typeName:
typeName = "LArHitContainer"
if not sgKey:
sgKey="LArHitEMB"
if not getter:
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
getter = D3PDMakerCoreComps.SGObjGetterTool(
name + '_Getter',
TypeName = typeName,
SGKey = sgKey)
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
+
return D3PDMakerCoreComps.ObjFillerTool( name,
Prefix = prefix,
Getter = getter,
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
index d8d161660399507254a788425bda8875d1ab63d4..b519d95f170365fae04e45fc985e962b026f295e 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
@@ -1,9 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.D3PDObject import (make_SG_D3PDObject, make_SGDataVector_D3PDObject)
-from math import pi
+from D3PDMakerCoreComps.D3PDObject import D3PDObject, make_SG_D3PDObject
import CaloSysD3PDMaker
@@ -41,18 +39,17 @@ def _makeSC_obj_(name, prefix, object_name,
sgKey=None,
typeName=None,
):
+ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
if not typeName:
typeName = "CaloCellContainer"
if not sgKey:
sgKey="AllCalo"
if not getter:
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
getter = D3PDMakerCoreComps.SGObjGetterTool(
name + '_Getter',
TypeName = typeName,
SGKey = sgKey)
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
return D3PDMakerCoreComps.ObjFillerTool( name,
Prefix = prefix,
Getter = getter,
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileCosmicMuonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileCosmicMuonD3PDObject.py
index 089e349a0a85dedeee129e1133cba6d82bcd0238..115f9784edcfb219f24dc4a40d75c0a242eb76cb 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileCosmicMuonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileCosmicMuonD3PDObject.py
@@ -3,15 +3,13 @@
import CaloSysD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from CaloD3PDMaker.makeTileCellFilterAlg import makeTileCellFilterAlg
-from CaloIdentifier import SUBCALO
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
def makeTileCosmicMuonD3PDObject (name, prefix, object_name='TileCosmicMuonD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'TileCosmicMuonHT'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'TileCosmicMuonHT'
+ if label is None: label = prefix
print(" makeTileCosmicMuonD3PDObject: name = ", name)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDetailsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDetailsD3PDObject.py
index f812414bca8ebaea78b67dfb776ecf4428f16848..ad91ad0dc14d08f603bd7d0b724a4a40b788c52d 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDetailsD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDetailsD3PDObject.py
@@ -1,13 +1,11 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id: TileDetailsD3PDObject.py 522639 2012-10-22 09:41:42Z ssnyder $
import CaloSysD3PDMaker
import D3PDMakerCoreComps
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import D3PDObject
from CaloD3PDMaker.makeTileCellFilterAlg import makeTileCellFilterAlg
-from CaloIdentifier import SUBCALO
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
BaseSGKey='holder'
@@ -18,7 +16,7 @@ def makeTileD3PDObject (name, prefix, object_name='TileDetailsD3PDObject', gette
global BaseSGKey
BaseSGKey=sgkey
sgkey = prefix
- if label == None: label = prefix
+ if label is None: label = prefix
print(" makeTileD3PDObject: name = ", name)
@@ -49,7 +47,7 @@ def hookForTileCellFilterAlg(c, prefix, *args, **kw) :
cellSigmaCut=-1.
global BaseSGKey
- if BaseSGKey == None or BaseSGKey=='holder' : BaseSGKey='AllCalo'
+ if BaseSGKey is None or BaseSGKey=='holder' : BaseSGKey='AllCalo'
sgkey = prefix
print(" in makeTileD3PDObject, sgkey, cellSigmaCut = ", sgkey, cellSigmaCut)
@@ -67,7 +65,7 @@ def hookForTileCellFilterAlg(c, prefix, *args, **kw) :
def TileCellRawAssoc(parent,prefix='',target='',level=0,blockname=None,*args,**kw):
- if blockname==None:
+ if blockname is None:
blockname=prefix+'TileCellRawAssociation'
return IndexMultiAssociation(parent,
@@ -79,7 +77,7 @@ def TileCellRawAssoc(parent,prefix='',target='',level=0,blockname=None,*args,**k
nrowName='')
def TileCellDigitAssoc(parent,prefix='',target='',level=0,blockname=None,*args,**kw):
- if blockname==None:
+ if blockname is None:
blockname=prefix+'TileCellDigitAssociation'
return IndexMultiAssociation(parent,
@@ -110,20 +108,7 @@ def makeTileCellD3PDObject (maker, prefix,object_name) :
SavePositionInfo=False,
)
- TileRawInCell=TileCellRawAssoc(parent=cellD3PDObject,
- prefix='rawCh_',
- target='tileraw_',
- level=2,
- blockname='RawChAssoc')
-
- TileDigitInCell=TileCellDigitAssoc(parent=cellD3PDObject,
- prefix='digit_',
- target='tiledigit_',
- level=3,
- blockname='DigitAssoc')
-
-
- return cellD3PDObject
+ return cellD3PDObject
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDigitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDigitD3PDObject.py
index 8ebf8fc3181614c8755342b0f25bb36df1badb6f..1e1d73cf11356669afdd577e675853bb79e16af9 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDigitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileDigitD3PDObject.py
@@ -11,8 +11,8 @@ TileDigitSGKey='TileDigitsFlt'
def makeTileDigitD3PDObject (name, prefix, object_name='TileDigitD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = TileDigitSGKey
- if label == None: label = prefix
+ if sgkey is None: sgkey = TileDigitSGKey
+ if label is None: label = prefix
if not getter:
getter = CaloSysD3PDMaker.SGTileDigitsGetterTool \
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileHitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileHitD3PDObject.py
index a707dafef096757d3896440ad8f3d74fa908057c..0c94a5fe3f729fd0700421c465454ce3fd2f21a4 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileHitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileHitD3PDObject.py
@@ -9,8 +9,8 @@ TileHitSGKey='TileHitVec'
def makeTileHitD3PDObject (name, prefix, object_name='TileHitD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = TileHitSGKey
- if label == None: label = prefix
+ if sgkey is None: sgkey = TileHitSGKey
+ if label is None: label = prefix
if not getter:
getter = CaloSysD3PDMaker.SGTileHitGetterTool \
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileL2D3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileL2D3PDObject.py
index e47393904f3f6dc7c1a836174d590a8c7b95570e..80a0f7e22f175f9fe09eea9ecde8d56406e49b0e 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileL2D3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileL2D3PDObject.py
@@ -7,8 +7,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTileL2D3PDObject (name, prefix, object_name='TileL2D3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'TileL2Cnt'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'TileL2Cnt'
+ if label is None: label = prefix
print(" makeTileL2D3PDObject: name = ", name)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileModuleBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileModuleBitsD3PDObject.py
index f4d8a38fb05f821df703b8ea1efd70b7d1ec9a72..a6593e926ebd5264fc7a2d08a32bb80ce94922a0 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileModuleBitsD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileModuleBitsD3PDObject.py
@@ -7,8 +7,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTileModuleBitsD3PDObject (name, prefix, object_name='TileModuleBitsD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = "TileRawChannelFlt"
- if label == None: label = prefix
+ if sgkey is None: sgkey = "TileRawChannelFlt"
+ if label is None: label = prefix
if not getter:
getter = CaloSysD3PDMaker.SGTileModuleBitsGetterTool \
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileMuD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileMuD3PDObject.py
index df8c92cdbb8cfa5c879b26e3956e221baadba815..1e051c4fa20704d423dafe3a17d1bba82c524957 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileMuD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileMuD3PDObject.py
@@ -7,8 +7,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTileMuD3PDObject (name, prefix, object_name='TileMuD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'TileMuObj'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'TileMuObj'
+ if label is None: label = prefix
print(" makeTileMuD3PDObject: name = ", name)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileRawChannelD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileRawChannelD3PDObject.py
index 9c80468980019c3caf82e188e81252a23b41f3fb..6136cdfc37b71e1a538720f68ea7faa70e8c5277 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileRawChannelD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileRawChannelD3PDObject.py
@@ -11,8 +11,8 @@ TileRawChannelSGKey='TileRawChannelFlt'
def makeTileRawChannelD3PDObject (name, prefix, object_name='TileRawChannelD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = TileRawChannelSGKey
- if label == None: label = prefix
+ if sgkey is None: sgkey = TileRawChannelSGKey
+ if label is None: label = prefix
if not getter:
getter = CaloSysD3PDMaker.SGTileRawChannelGetterTool \
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTTL1D3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTTL1D3PDObject.py
index 92705525b3c651597e0192512d59d448b44bb1c4..029880db3c2f8015de720d85357a46f301c172a1 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTTL1D3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTTL1D3PDObject.py
@@ -7,8 +7,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTileTTL1D3PDObject (name, prefix, object_name='TileTTL1D3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'TileTTL1Cnt'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'TileTTL1Cnt'
+ if label is None: label = prefix
print(" makeTileTTL1D3PDObject: name = ", name)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTriggerD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTriggerD3PDObject.py
index 88080f4453d11a8738f965f555f06939569cda25..28ec71a3790de2df650baf0f40b7a1ba8979fbf7 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTriggerD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TileTriggerD3PDObject.py
@@ -7,8 +7,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTileTriggerD3PDObject (name, prefix, object_name='TileTriggerD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'TileTriggerCnt'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'TileTriggerCnt'
+ if label is None: label = prefix
print(" makeTileTriggerD3PDObject: name = ", name)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TowerD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TowerD3PDObject.py
index af0fd7e2e9411b52dc6829bf066eb092c68eb3fa..ce3cd668e12d414e4e3b5f280575d3aa193ca568 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TowerD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/TowerD3PDObject.py
@@ -9,8 +9,8 @@ from D3PDMakerCoreComps.D3PDObject import D3PDObject
def makeTowerD3PDObject (name, prefix, object_name='TowerD3PDObject', getter = None,
sgkey = None,
label = None):
- if sgkey == None: sgkey = 'CombinedTower'
- if label == None: label = prefix
+ if sgkey is None: sgkey = 'CombinedTower'
+ if label is None: label = prefix
ContainerType='CaloTowerContainer'
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/__init__.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/__init__.py
index 0af401c31663b49d8372722ac0ee858960d9e41f..a27bb2095f0595030cb2e49d336a1ef77d90e493 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/__init__.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/__init__.py
@@ -21,4 +21,4 @@ for k, v in list(CaloSysD3PDMakerConf.__dict__.items()):
if k.startswith ('D3PD__'):
globals()[k[6:]] = v
-from .ClusterMomentFillerTool import ClusterMomentFillerTool
+from .ClusterMomentFillerTool import ClusterMomentFillerTool # noqa: F401