diff --git a/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt b/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ad2c0738f0fda62c2ce9d657f733d5e3162cf016
--- /dev/null
+++ b/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt
@@ -0,0 +1,27 @@
+################################################################################
+# Package: xAODJetAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( xAODJetAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+ Control/AthContainers
+ Control/AthenaKernel
+ Database/AthenaPOOL/AthenaPoolCnvSvc
+ Database/AthenaPOOL/AthenaPoolUtilities
+ Event/xAOD/xAODJet )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( xAODJetAthenaPoolPoolCnv
+ src/*.cxx
+ FILES xAODJet/JetContainer.h xAODJet/JetAuxContainer.h xAODJet/JetTrigAuxContainer.h
+ TYPES_WITH_NAMESPACE xAOD::JetContainer xAOD::JetAuxContainer xAOD::JetTrigAuxContainer
+ CNV_PFX xAOD
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODJet )
+
diff --git a/Event/xAOD/xAODJetAthenaPool/cmt/requirements b/Event/xAOD/xAODJetAthenaPool/cmt/requirements
index 711c5e41c656995a1678f8c9eeca723fb4737206..42697fbc3e96def2423f43bfde896d7ea6ee8157 100644
--- a/Event/xAOD/xAODJetAthenaPool/cmt/requirements
+++ b/Event/xAOD/xAODJetAthenaPool/cmt/requirements
@@ -1,5 +1,5 @@
package xAODJetAthenaPool
-# $Id: requirements 635124 2014-12-10 17:42:28Z ssnyder $
+# $Id: requirements 676007 2015-06-17 14:30:45Z delsart $
author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -15,7 +15,7 @@ private
use AthenaKernel AthenaKernel-* Control
use AthContainers AthContainers-* Control
-use AtlasROOT AtlasROOT-* External
+use AtlasROOT AtlasROOT-* External
# POOL package(s):
use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
@@ -25,11 +25,26 @@ use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
use xAODJet xAODJet-* Event/xAOD
# Declare the pool converter(s):
-apply_pattern poolcnv typesWithNamespace="xAOD::JetContainer \
- xAOD::JetAuxContainer \
- xAOD::JetTrigAuxContainer" \
- files="-s=${xAODJet_root}/xAODJet \
- JetContainer.h \
- JetAuxContainer.h \
- JetTrigAuxContainer.h" \
+#apply_pattern poolcnv typesWithNamespace="xAOD::JetContainer \
+# xAOD::JetAuxContainer \
+# xAOD::JetTrigAuxContainer" \
+# files="-s=${xAODJet_root}/xAODJet \
+# JetContainer.h \
+# JetAuxContainer.h \
+# JetTrigAuxContainer.h" \
+# cnv_pfx="xAOD"
+macro xAODJetConvTypes "xAOD::JetContainer \
+ xAOD::JetAuxContainer \
+ xAOD::JetTrigAuxContainer" \
+ AthSimulationBase "xAOD::JetContainer \
+ xAOD::JetAuxContainer"
+macro xAODJetConvFiles "-s=${xAODJet_root}/xAODJet \
+ JetContainer.h \
+ JetAuxContainer.h \
+ JetTrigAuxContainer.h" \
+ AthSimulationBase "-s=${xAODJet_root}/xAODJet \
+ JetContainer.h \
+ JetAuxContainer.h"
+apply_pattern poolcnv typesWithNamespace=${xAODJetConvTypes} \
+ files=${xAODJetConvFiles} \
cnv_pfx="xAOD"
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.cxx b/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.cxx
index 807005d4600d2019ab24794f63af805ae00ac0e9..bfd4314890dc8da759b50914a734a25387529114 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.cxx
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: xAODJetAuxContainerCnv.cxx 635124 2014-12-10 17:42:28Z ssnyder $
+// $Id: xAODJetAuxContainerCnv.cxx 635123 2014-12-10 17:42:24Z ssnyder $
// System include(s):
#include <exception>
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.cxx b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.cxx
index 76f5e729316dde7d6ec8913e49222f4f739e8e00..3dafeac054c40ede3b0045cc5ab5659a0d58bef5 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.cxx
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.cxx
@@ -4,6 +4,8 @@
// $Id: xAODJetAuxContainerCnv.cxx 588765 2014-03-21 13:30:28Z delsart $
+#ifndef SIMULATIONBASE
+
// System include(s):
#include <exception>
@@ -59,3 +61,4 @@ xAOD::JetTrigAuxContainer* xAODJetTrigAuxContainerCnv::createTransient() {
"xAOD::JetTrigAuxContainer found" );
return 0;
}
+#endif // SIMULATIONBASE
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
index 389708a16d72eb67a04bc486f46e53ccb1eb4416..a763dbb0718288a945ab518e76faafdec8f2bef0 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
@@ -7,6 +7,8 @@
#ifndef XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_H
#define XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_H
+#ifndef SIMULATIONBASE
+
// Gaudi/Athena include(s):
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
@@ -49,5 +51,5 @@ protected:
virtual xAOD::JetTrigAuxContainer* createTransient();
}; // class xAODJetTrigAuxContainerCnv
-
+#endif // SIMULATIONBASE
#endif // XAODJETATHENAPOOL_XAODJETAUXCONTAINERCNV_H