Skip to content
Snippets Groups Projects
Commit 78eb0e14 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

TileD3PDMaker: cmake and flake8 fixes 

Cleanup cmake configuration, enable flake8 and make code compliant.
Delete unused `TileD3PD.py` modules.
parent 6f6a97cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
PhysicsAnalysis/D3PDMaker/TileD3PDMaker/CMakeLists.txt
+ 5
− 12
View file @ 78eb0e14
################################################################################ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Package: TileD3PDMaker
################################################################################
# Declare the package name: # Declare the package name:
atlas_subdir( TileD3PDMaker ) atlas_subdir( TileD3PDMaker )
# External dependencies: # External dependencies:
find_package( Boost COMPONENTS filesystem thread system ) find_package( ROOT COMPONENTS Core MathCore )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package: # Component(s) in the package:
atlas_add_component( TileD3PDMaker atlas_add_component( TileD3PDMaker
src/*.cxx src/*.cxx
src/components/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AtlasHepMCLib CaloEvent CaloGeoHelpers AthContainers AthenaBaseComps LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AtlasHepMCLib CaloEvent CaloGeoHelpers D3PDMakerUtils EventInfo GaudiKernel GeneratorObjects GeoModelInterfaces GeoModelUtilities GeoPrimitives ITrackToVertex Identifier RDBAccessSvcLib RecoToolInterfaces StoreGateLib TileEvent TileIdentifier TrkParameters TrkParametersIdentificationHelpers VxVertex xAODCaloEvent xAODEventInfo xAODMissingET xAODMuon xAODPrimitives xAODTracking xAODTrigger )
StoreGateLib SGtests GeoModelUtilities Identifier EventInfo xAODCaloEvent xAODEventInfo xAODMissingET xAODMuon xAODPrimitives xAODTracking
xAODTrigger GaudiKernel GeneratorObjects D3PDMakerUtils RecoToolInterfaces ITrackToVertex TileEvent TileIdentifier
TrkParameters TrkParametersIdentificationHelpers VxVertex TrigInDetEvent TrigMuonEvent )
# Install files from the package: # 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 ) atlas_install_joboptions( share/*.py )
PhysicsAnalysis/D3PDMaker/TileD3PDMaker/python/TileD3PD.py deleted 100644 → 0
+ 0
− 42
View file @ 6f6a97cd
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# -*- coding: iso-8859-1 -*-
#
# File: TileD3PD.py
# Author: Marco van Woerden <mvanwoer@cern.ch>
# Date: September 2012
#
import TileD3PDMaker.TileD3PDObject
from TileD3PDMaker.TileD3PDObject import *
from TileD3PDMaker import *
from D3PDMakerCoreComps.resolveSGKey import testSGKey
def mu_D3PD (alg = None,
file = 'tile.root',
tuplename = 'calo'):
if not alg:
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
alg = MSMgr.NewRootStream( tuplename, file )
alg += TileD3PDMaker.TileD3PDObject.TileCellD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileMBTSD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileStacoMuonD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileEventD3PDObject(10)
return alg
def Ep_D3PD (alg = None,
file = 'tile.root',
tuplename = 'calo'):
if not alg:
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
alg = MSMgr.NewRootStream( tuplename, file )
alg += TileD3PDMaker.TileD3PDObject.TileTrackD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileCellD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileEventD3PDObject(10)
#alg += TileD3PDMaker.TileD3PDObject.TileMuonD3PDObject(10)
alg += TileD3PDMaker.TileD3PDObject.TileClusterD3PDObject(10)
return alg
PhysicsAnalysis/D3PDMaker/TileD3PDMaker/python/TileD3PDObject.py
+ 2
− 88
View file @ 78eb0e14
# 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: TileAnalysisD3PDObject.py # File: TileAnalysisD3PDObject.py
...@@ -8,22 +8,9 @@ ...@@ -8,22 +8,9 @@
# #
# IMPORT MODULES # IMPORT MODULES
import TileD3PDMaker
import D3PDMakerCoreComps import D3PDMakerCoreComps
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import D3PDObject
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerCoreComps.D3PDObject import make_Void_D3PDObject
from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
from AthenaCommon.AlgSequence import AlgSequence
from TileD3PDMaker import *
from CaloIdentifier import SUBCALO
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# VECTORFILLER DEFINITIONS # VECTORFILLER DEFINITIONS
def make_Cell_D3PDVectorFiller(name, prefix, object_name, getter = None,sgkey = None,label = None): def make_Cell_D3PDVectorFiller(name, prefix, object_name, getter = None,sgkey = None,label = None):
...@@ -65,76 +52,3 @@ def make_Cluster_D3PDVectorFiller(name, prefix, object_name, getter = None,sgkey ...@@ -65,76 +52,3 @@ def make_Cluster_D3PDVectorFiller(name, prefix, object_name, getter = None,sgkey
# CREATE SELECTED # CREATE SELECTED
return D3PDMakerCoreComps.VectorFillerTool('cluster_Getter',Prefix = 'clusters_',Getter = calocluster_getter, return D3PDMakerCoreComps.VectorFillerTool('cluster_Getter',Prefix = 'clusters_',Getter = calocluster_getter,
ObjectName = 'caloclusters',SaveMetadata = D3PDMakerFlags.SaveObjectMetadata()) ObjectName = 'caloclusters',SaveMetadata = D3PDMakerFlags.SaveObjectMetadata())
######################################################
# RETRIEVE D3PD OBJECT CONTAINING SELECTED TRACKS #
######################################################
#TileTrackD3PDObject = D3PDObject(make_Track_D3PDVectorFiller, 'tracks_' , 'TracksD3PDObject')
#TileTrackD3PDObject.defineBlock(0, 'TrackParticleDump', TileD3PDMaker.TileTrackFillerTool)
######################################################
# RETRIEVE D3PD OBJECT CONTAINING SELECTED CALOCELLS #
######################################################
#TileCellD3PDObject = D3PDObject(make_Cell_D3PDVectorFiller, 'cells_' , 'CellsD3PDObject')
#TileCellD3PDObject.defineBlock(0, 'CaloCellDump', TileD3PDMaker.TileCellFillerTool)
#TileMBTSD3PDObject = D3PDObject(make_MBTS_D3PDVectorFiller, 'mbts_' , 'MBTSD3PDObject')
#TileMBTSD3PDObject.defineBlock(0, 'MBTSDump', TileD3PDMaker.TileMBTSFillerTool)
######################################################
# RETRIEVE D3PD OBJECT CONTAINING SELECTED CLUSTERS #
######################################################
#TileClusterD3PDObject = D3PDObject(make_Cluster_D3PDVectorFiller, 'clusters_' , 'ClustersD3PDObject')
#TileClusterD3PDObject.defineBlock(0, 'CaloClusterDump', TileD3PDMaker.TileCaloClusterFillerTool)
#########################################
# RETRIEVE D3PD OBJECT CONTAINING MUONS #
#########################################
#TileStacoMuonD3PDObject = make_SGDataVector_D3PDObject ('Analysis::MuonContainer','StacoMuonCollection','mu_', 'TileStacoMuonD3PDObject')
#TileStacoMuonD3PDObject.defineBlock(0, 'StacoDump', TileD3PDMaker.TileMuonFillerTool)
#TileMuidMuonD3PDObject = make_SGDataVector_D3PDObject ('Analysis::MuonContainer','MuidMuonCollection','muid_', 'TileMuidMuonD3PDObject')
#TileMuidMuonD3PDObject.defineBlock(0, 'MuidDump', TileD3PDMaker.TileMuonFillerTool)
#######################################
# EVENT BY EVENT INFORMATION TO STORE #
#######################################
#TileEventD3PDObject = make_SG_D3PDObject( "EventInfo", D3PDMakerFlags.EventInfoSGKey(), 'evt_', "TileEventD3PDObject" )
#TileEventD3PDObject.defineBlock(0, 'EventDump', TileD3PDMaker.TileEventFillerTool)
######################
# SETUP ASSOCIATIONS #
######################
#IndexMultiAssociation(parent=TileCellD3PDObject,assoctool=TileD3PDMaker.TileCellMuAssociationTool,target="mu_",prefix="cellsmu_",level=0,blockname="AssocCellToMuon")
#IndexMultiAssociation(parent=TileMuonD3PDObject,assoctool=TileD3PDMaker.TileMuCellAssociationTool,target="cells_",prefix="mucells_",level=0,blockname="AssocMuonToCell")
#IndexMultiAssociation(parent=TileClusterD3PDObject,assoctool=TileD3PDMaker.TileClusterCellAssociationTool,target="cells_",prefix="clustercells_",level=0,blockname="AssocClusterToCell")
#IndexMultiAssociation(parent=TileTrackD3PDObject,assoctool=TileD3PDMaker.TileTrackCellAssociationTool,target="cells_",prefix="trackcells_",level=0,blockname="AssocTrackToCell")
#IndexMultiAssociation(parent=TileTrackD3PDObject,assoctool=TileD3PDMaker.TileTrackClusterAssociationTool,target="clusters_",prefix="trackclusters_",level=0,blockname="AssocTrackToCluster")
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment