From 3b9c59131cf7e10e429e8a26a6477aa8004f7883 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:42:19 +0200
Subject: [PATCH] 'CMakeLists.txt' (D3PDMakerTest-00-10-04)
* Tagging D3PDMakerTest-00-10-04.
* share/D3PDTest1_jo.py: AnalysisToolsConf -> AthAnalysisToolsConf.
---
.../D3PDMaker/D3PDMakerTest/CMakeLists.txt | 56 +++++++++++++++++++
.../D3PDMakerTest/share/D3PDTest1_jo.py | 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
new file mode 100644
index 00000000000..e13b6ba6517
--- /dev/null
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
@@ -0,0 +1,56 @@
+################################################################################
+# Package: D3PDMakerTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( D3PDMakerTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthContainers
+ Control/CLIDSvc
+ Control/Navigation
+ Control/SGTools
+ Event/FourMom
+ PhysicsAnalysis/AnalysisCommon/ParticleEvent
+ PRIVATE
+ Control/AthenaBaseComps
+ Control/AthenaKernel
+ Control/CxxUtils
+ Control/StoreGate
+ Event/EventKernel
+ Event/NavFourMom
+ GaudiKernel
+ MuonSpectrometer/MuonSimEvent
+ PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
+ Simulation/G4Sim/TrackRecord
+ TestPolicy )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( D3PDMakerTestLib
+ src/*.cxx
+ PUBLIC_HEADERS D3PDMakerTest
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
+ LINK_LIBRARIES AthContainers Navigation SGTools FourMom ParticleEvent StoreGateLib SGtests
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils EventKernel NavFourMom GaudiKernel MuonSimEvent D3PDMakerUtils )
+
+atlas_add_component( D3PDMakerTest
+ src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers Navigation SGTools FourMom ParticleEvent AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests EventKernel NavFourMom GaudiKernel MuonSimEvent D3PDMakerUtils D3PDMakerTestLib )
+
+atlas_add_dictionary( D3PDMakerTestDict
+ D3PDMakerTest/D3PDMakerTestDict.h
+ D3PDMakerTest/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers Navigation SGTools FourMom ParticleEvent AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests EventKernel NavFourMom GaudiKernel MuonSimEvent D3PDMakerUtils D3PDMakerTestLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTest1_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTest1_jo.py
index 2b13ce13507..f99d0728c59 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTest1_jo.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTest1_jo.py
@@ -212,7 +212,7 @@ from MuonD3PDMaker.TrackRecordD3PDObject import TrackRecordD3PDObject
alg += TrackRecordD3PDObject (99, sgkey = 'TrackRecord',
exclude = ['TruthHits'])
-from AnalysisTools.AnalysisToolsConf import AANTupleStream
+from AnalysisTools.AthAnalysisToolsConf import AANTupleStream
AANTupleStream('D3PD').ExistDataHeader = False
--
GitLab