From 48fdb0db88154e43b71df97eb256ec6f06a0ed2c Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:01:51 +0200
Subject: [PATCH] 'CMakeLists.txt' (xAODTrigEgammaAthenaPool-00-00-07)

	* Tagging xAODTrigEgammaAthenaPool-00-00-07.
	* src/xAODTrigEgammaAthenaPoolTPCnv.cxx: Use
	DECLARE_TRIGTPCNV_FACTORY for trigger-only conversions.  Avoids
	warnings about duplicate converters.
---
 .../xAODTrigEgammaAthenaPool/CMakeLists.txt   | 25 ++++++++++
 .../src/xAODTrigEgammaAthenaPoolTPCnv.cxx     | 50 +++++++++----------
 2 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt

diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt
new file mode 100644
index 00000000000..016a2b996c2
--- /dev/null
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt
@@ -0,0 +1,25 @@
+################################################################################
+# Package: xAODTrigEgammaAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( xAODTrigEgammaAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          Control/AthContainers
+                          Control/AthenaKernel
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          Event/xAOD/xAODEgamma
+                          Event/xAOD/xAODTrigEgamma
+                          GaudiKernel )
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( xAODTrigEgammaAthenaPoolPoolCnv
+                           src/*.cxx
+                           FILES xAODTrigEgamma/TrigPhotonContainer.h xAODTrigEgamma/TrigPhotonAuxContainer.h xAODTrigEgamma/TrigElectronContainer.h xAODTrigEgamma/TrigElectronAuxContainer.h xAODTrigEgamma/ElectronTrigAuxContainer.h xAODTrigEgamma/PhotonTrigAuxContainer.h
+                           TYPES_WITH_NAMESPACE xAOD::TrigPhotonContainer xAOD::TrigElectronContainer xAOD::ElectronTrigAuxContainer xAOD::PhotonTrigAuxContainer
+                           CNV_PFX xAOD
+                           LINK_LIBRARIES AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODEgamma xAODTrigEgamma GaudiKernel )
+
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigEgammaAthenaPoolTPCnv.cxx b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigEgammaAthenaPoolTPCnv.cxx
index 4cb551b9faf..6dcdeedb49d 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigEgammaAthenaPoolTPCnv.cxx
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigEgammaAthenaPoolTPCnv.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: xAODTrigEgammaAthenaPoolTPCnv.cxx 705790 2015-11-04 13:09:23Z krasznaa $
+// $Id: xAODTrigEgammaAthenaPoolTPCnv.cxx 714614 2015-12-14 21:26:28Z ssnyder $
 
 // Gaudi/Athena include(s):
 #include "AthenaKernel/TPCnvFactory.h"
@@ -26,28 +26,28 @@
 #include "xAODPhotonTrigAuxContainerOfflineCnv_v3.h"
 
 // Declare the T/P converter(s):
-DECLARE_TPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v1,
-                       xAOD::ElectronTrigAuxContainer,
-                       xAOD::ElectronAuxContainer_v1,
-                       Athena::TPCnvVers::Old )
-DECLARE_TPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v2,
-                       xAOD::ElectronTrigAuxContainer,
-                       xAOD::ElectronAuxContainer_v2,
-                       Athena::TPCnvVers::Old )
-DECLARE_TPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v3,
-                       xAOD::ElectronTrigAuxContainer,
-                       xAOD::ElectronAuxContainer_v3,
-                       Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v1,
+                           xAOD::ElectronTrigAuxContainer,
+                           xAOD::ElectronAuxContainer_v1,
+                           Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v2,
+                           xAOD::ElectronTrigAuxContainer,
+                           xAOD::ElectronAuxContainer_v2,
+                           Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODElectronTrigAuxContainerOfflineCnv_v3,
+                           xAOD::ElectronTrigAuxContainer,
+                           xAOD::ElectronAuxContainer_v3,
+                           Athena::TPCnvVers::Old )
 
-DECLARE_TPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v1,
-                       xAOD::PhotonTrigAuxContainer,
-                       xAOD::PhotonAuxContainer_v1,
-                       Athena::TPCnvVers::Old )
-DECLARE_TPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v2,
-                       xAOD::PhotonTrigAuxContainer,
-                       xAOD::PhotonAuxContainer_v2,
-                       Athena::TPCnvVers::Old )
-DECLARE_TPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v3,
-                       xAOD::PhotonTrigAuxContainer,
-                       xAOD::PhotonAuxContainer_v3,
-                       Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v1,
+                           xAOD::PhotonTrigAuxContainer,
+                           xAOD::PhotonAuxContainer_v1,
+                           Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v2,
+                           xAOD::PhotonTrigAuxContainer,
+                           xAOD::PhotonAuxContainer_v2,
+                           Athena::TPCnvVers::Old )
+DECLARE_TRIGTPCNV_FACTORY( xAODPhotonTrigAuxContainerOfflineCnv_v3,
+                           xAOD::PhotonTrigAuxContainer,
+                           xAOD::PhotonAuxContainer_v3,
+                           Athena::TPCnvVers::Old )
-- 
GitLab