diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d75c9e970b8ab2949d1eea191e5d696c128e5bd2
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
@@ -0,0 +1,51 @@
+################################################################################
+# Package: InDetByteStreamErrorsAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( InDetByteStreamErrorsAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs(
+ PUBLIC
+ Database/AthenaPOOL/AthenaPoolUtilities
+ DetectorDescription/Identifier
+ PRIVATE
+ GaudiKernel
+ AtlasTest/TestTools
+ Control/DataModel
+ Database/AthenaPOOL/AthenaPoolCnvSvc
+ InnerDetector/InDetConditions/InDetByteStreamErrors )
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( InDetByteStreamErrorsAthenaPoolPoolCnv src/*.cxx
+ FILES InDetByteStreamErrors/InDetBSErrContainer.h
+ InDetByteStreamErrors/TRT_BSIdErrContainer.h
+ InDetByteStreamErrors/TRT_BSErrContainer.h
+ LINK_LIBRARIES AthenaPoolUtilities Identifier TestTools DataModel
+ AthenaPoolCnvSvcLib )
+
+atlas_add_dictionary( InDetByteStreamErrorsAthenaPoolCnvDict
+ InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h
+ InDetByteStreamErrorsAthenaPool/selection.xml
+ LINK_LIBRARIES AthenaPoolUtilities Identifier TestTools DataModel
+ AthenaPoolCnvSvcLib )
+
+# Tests in the package:
+atlas_add_test( InDetBSErrContainerCnv_p1_test
+ SOURCES test/InDetBSErrContainerCnv_p1_test.cxx
+ src/InDetBSErrContainerCnv_p1.cxx
+ LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
+
+atlas_add_test( TRT_BSErrContainerCnv_p1_test
+ SOURCES test/TRT_BSErrContainerCnv_p1_test.cxx
+ src/TRT_BSErrContainerCnv_p1.cxx
+ LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
+
+atlas_add_test( TRT_BSIdErrContainerCnv_p1_test
+ SOURCES test/TRT_BSIdErrContainerCnv_p1_test.cxx
+ src/TRT_BSIdErrContainerCnv_p1.cxx
+ LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
+
+# Install files from the package:
+atlas_install_headers( InDetByteStreamErrorsAthenaPool )
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetBSErrContainer_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h
similarity index 72%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetBSErrContainer_p1.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h
index 58159d33827261c357d15469e2baed3ddb26c5ee..efd2e08ebd0e9240a79690ed0cfc26b40857093b 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetBSErrContainer_p1.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h
@@ -2,15 +2,15 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef INDETBSERRCONTAINER_P1_H
-#define INDETBSERRCONTAINER_P1_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_INDETBSERRCONTAINER_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_INDETBSERRCONTAINER_P1_H
#include <vector>
#include <stdint.h>
#include "Identifier/IdentifierHash.h"
-class InDetBSErrContainer_p1
+class InDetBSErrContainer_p1
{
public:
/// Default constructor
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..445a1faf6c4fe0535e3c92d9f4fcd70f1d734002
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h
@@ -0,0 +1,10 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_INDETBYTESTREAMERRORSATHENAPOOLDICT_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_INDETBYTESTREAMERRORSATHENAPOOLDICT_H
+#include "InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h"
+#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h
similarity index 61%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h
index 22cbe29b89d2e1e7e6feff3019a743e868b1b7c5..c3605233a9dcb78d061e59d12d4800a81cd6da49 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h
@@ -2,14 +2,14 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRT_BSERRCONTAINER_P1_H
-#define TRT_BSERRCONTAINER_P1_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSERRCONTAINER_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSERRCONTAINER_P1_H
#include <vector>
#include <stdint.h>
-class TRT_BSErrContainer_p1
+class TRT_BSErrContainer_p1
{
public:
/// Default constructor
@@ -24,5 +24,5 @@ class TRT_BSErrContainer_p1
inline
TRT_BSErrContainer_p1::TRT_BSErrContainer_p1 () {}
-#endif // Not TRT_BSERRCONTAINER_P1_H
+#endif // Not INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSERRCONTAINER_P1_H
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h
similarity index 62%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h
index 0af2ce76123097c1ed47bff31c034b459aedf779..3325d087a06d0f24620e5c5bde7f30c65f3a8297 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h
@@ -2,13 +2,13 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRT_BSIDERRCONTAINER_P1_H
-#define TRT_BSIDERRCONTAINER_P1_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIDERRCONTAINER_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIDERRCONTAINER_P1_H
#include <stdint.h>
#include <vector>
-class TRT_BSIdErrContainer_p1
+class TRT_BSIdErrContainer_p1
{
public:
/// Default constructor
@@ -23,5 +23,5 @@ class TRT_BSIdErrContainer_p1
inline
TRT_BSIdErrContainer_p1::TRT_BSIdErrContainer_p1 () {}
-#endif // Not TRT_BSIDERRCONTAINER_P1_H
+#endif // Not INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIDERRCONTAINER_P1_H
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/selection.xml b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/selection.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4eb591742f02f12415b7efb8f7df2b1f373206ad
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/selection.xml
@@ -0,0 +1,5 @@
+<lcgdict>
+ <class name="InDetBSErrContainer_p1" id="FA64DC17-D07E-4305-9B21-18C64F1B4C47" />
+ <class name="TRT_BSErrContainer_p1" id="D461AC01-02CA-4A9E-886B-24EC14309121" />
+ <class name="TRT_BSIdErrContainer_p1" id="26F44F1E-D1F5-43B3-93E9-09376AB37491" />
+</lcgdict>
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/InDetBSErrContainerCnv_p1_test.ref b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/InDetBSErrContainerCnv_p1_test.ref
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/InDetBSErrContainerCnv_p1_test.ref
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/InDetBSErrContainerCnv_p1_test.ref
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/TRT_BSErrContainerCnv_p1_test.ref b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/TRT_BSErrContainerCnv_p1_test.ref
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/TRT_BSErrContainerCnv_p1_test.ref
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/TRT_BSErrContainerCnv_p1_test.ref
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/TRT_BSIdErrContainerCnv_p1_test.ref b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/TRT_BSIdErrContainerCnv_p1_test.ref
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/share/TRT_BSIdErrContainerCnv_p1_test.ref
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/share/TRT_BSIdErrContainerCnv_p1_test.ref
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.cxx
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
similarity index 84%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
index 5274f7070927f90f2c460f782ecafacd3e468dd3..33aa036aeb66532b13321528c8964308878e8bc8 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
@@ -2,20 +2,20 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-/**
+/**
* @file InDetBSErrContainerCnv.h
* @brief Generated header file which defines a typedef for templated converter class
* @author RD Schaffer <R.D. Schaffer@cern.ch>
*/
-#ifndef InDetBSErrContainerCnv_H
-#define InDetBSErrContainerCnv_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_InDetBSErrContainerCnv_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_InDetBSErrContainerCnv_H
#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
#include "InDetByteStreamErrors/InDetBSErrContainer.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "InDetConditionsAthenaPool/InDetBSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h"
#include "InDetBSErrContainerCnv_p1.h"
/** the latest persistent representation type of DataCollection: */
@@ -32,5 +32,3 @@ protected:
InDetBSErrContainerCnv_p1 m_TPConverter;
};
#endif
-
-
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
similarity index 96%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
index 1ee81612bc47b680b1430383d52ac8cb5115f190..cb29db6457c413d375044faf0435ca3b67424ef8 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "InDetConditionsAthenaPool/InDetBSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h"
#include "InDetByteStreamErrors/InDetBSErrContainer.h"
#include "InDetBSErrContainerCnv_p1.h"
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..076db36c5faa93cfe3ecce7c33854bbdc9df96cd
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.h
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_INDETBSERRCONTAINERCNV_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_INDETBSERRCONTAINERCNV_P1_H
+
+#include "InDetByteStreamErrors/InDetBSErrContainer.h"
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "InDetByteStreamErrorsAthenaPool/InDetBSErrContainer_p1.h"
+
+
+class InDetBSErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<InDetBSErrContainer, InDetBSErrContainer_p1>
+{
+ public:
+ InDetBSErrContainerCnv_p1(){};
+
+ virtual void persToTrans(const InDetBSErrContainer_p1* persCont,
+ InDetBSErrContainer* transCont,
+ MsgStream &log) ;
+ virtual void transToPers(const InDetBSErrContainer* transCont,
+ InDetBSErrContainer_p1* persCont,
+ MsgStream &log) ;
+ virtual InDetBSErrContainer* createTransient(const InDetBSErrContainer_p1* persObj, MsgStream& log) ;
+
+};
+
+#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.cxx
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
similarity index 84%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
index 81b8434e569e9df347f514e7490230b4e7944b14..0cfc32ad52ed8da70aff96a98bb221cf605f108e 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
@@ -2,20 +2,20 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-/**
+/**
* @file TRT_BSErrContainerCnv.h
* @brief Generated header file which defines a typedef for templated converter class
* @author RD Schaffer <R.D. Schaffer@cern.ch>
*/
-#ifndef TRT_BSErrContainerCnv_H
-#define TRT_BSErrContainerCnv_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSErrContainerCnv_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSErrContainerCnv_H
#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h"
#include "TRT_BSErrContainerCnv_p1.h"
// the latest persistent representation type of DataCollection:
@@ -32,5 +32,3 @@ protected:
TRT_BSErrContainerCnv_p1 m_TPConverter;
};
#endif
-
-
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
similarity index 96%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
index eb621d65cf907fb41e3060eab5db406f1d136e97..2f2eaeb1b33fe005db6744da2ad58d7384cd0716 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h"
#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
#include "TRT_BSErrContainerCnv_p1.h"
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..b47b73a20eea0235d71e95b4459b4462ea37d0f5
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.h
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSERRCONTAINERCNV_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSERRCONTAINERCNV_P1_H
+
+#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSErrContainer_p1.h"
+
+
+class TRT_BSErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<TRT_BSErrContainer, TRT_BSErrContainer_p1>
+{
+ public:
+ TRT_BSErrContainerCnv_p1(){};
+
+ virtual void persToTrans(const TRT_BSErrContainer_p1* persCont,
+ TRT_BSErrContainer* transCont,
+ MsgStream &log) ;
+ virtual void transToPers(const TRT_BSErrContainer* transCont,
+ TRT_BSErrContainer_p1* persCont,
+ MsgStream &log) ;
+ virtual TRT_BSErrContainer* createTransient(const TRT_BSErrContainer_p1* persObj, MsgStream& log) ;
+
+};
+
+#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.cxx
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
similarity index 84%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv.h
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
index 2c729d7979e505e695e07f13e24a5c68570543c5..c7c1f9a86431ea7080bf1e24da1474b729cbab75 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
@@ -2,20 +2,20 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-/**
+/**
* @file TRT_BSIdErrContainerCnv.h
* @brief Generated header file which defines a typedef for templated converter class
* @author RD Schaffer <R.D. Schaffer@cern.ch>
*/
-#ifndef TRT_BSIdErrContainerCnv_H
-#define TRT_BSIdErrContainerCnv_H
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIdErrContainerCnv_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIdErrContainerCnv_H
#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
#include "InDetByteStreamErrors/TRT_BSIdErrContainer.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h"
#include "TRT_BSIdErrContainerCnv_p1.h"
// the latest persistent representation type of DataCollection:
@@ -32,5 +32,3 @@ protected:
TRT_BSIdErrContainerCnv_p1 m_TPConverter;
};
#endif
-
-
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
similarity index 96%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
index 36b53023e0ae578884becb8bd7933d7f7ae74e04..83081f3d120a6e43afb4f866e787f0801dded6d1 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h"
#include "InDetByteStreamErrors/TRT_BSIdErrContainer.h"
#include "TRT_BSIdErrContainerCnv_p1.h"
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..8c32507e079856f9b3d88e91a72840c5d02e8439
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIDERRCONTAINERCNV_P1_H
+#define INDETBYTESTREAMERRORSATHENAPOOL_TRT_BSIDERRCONTAINERCNV_P1_H
+
+#include "InDetByteStreamErrors/TRT_BSIdErrContainer.h"
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "InDetByteStreamErrorsAthenaPool/TRT_BSIdErrContainer_p1.h"
+
+
+class TRT_BSIdErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<TRT_BSIdErrContainer, TRT_BSIdErrContainer_p1>
+{
+ public:
+ TRT_BSIdErrContainerCnv_p1(){};
+
+ virtual void persToTrans(const TRT_BSIdErrContainer_p1* persCont,
+ TRT_BSIdErrContainer* transCont,
+ MsgStream &log) ;
+ virtual void transToPers(const TRT_BSIdErrContainer* transCont,
+ TRT_BSIdErrContainer_p1* persCont,
+ MsgStream &log) ;
+ virtual TRT_BSIdErrContainer* createTransient(const TRT_BSIdErrContainer_p1* persObj, MsgStream& log) ;
+
+};
+
+#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
similarity index 93%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
index 66612ba5232546e0a759f7e9fc699df1ebdc3796..3fa348bcd2ee46bc1a5dc19bfd206e35cf914aef 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
@@ -4,7 +4,7 @@
// $Id$
/**
- * @file InDetConditionsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
+ * @file InDetByteStreamErrorsAthenaPool/test/InDetBSErrContainerCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
* @date Oct, 2015
* @brief Unit test
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetConditionsAthenaPool.xml b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetByteStreamErrorsAthenaPool.xml
similarity index 73%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetConditionsAthenaPool.xml
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetByteStreamErrorsAthenaPool.xml
index 6e5108d3cbf3c90651f7450fdd59760a718b1215..5e28eb7c5e221713c0480f216f3eccfc4e04d20d 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/InDetConditionsAthenaPool.xml
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/InDetByteStreamErrorsAthenaPool.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<atn>
- <TEST name="InDetConditionsAthenaPoolTest" type="makecheck" suite="Examples">
- <package>InnerDetector/InDetConditions/InDetConditionsAthenaPool</package>
+ <TEST name="InDetByteStreamErrorsAthenaPoolTest" type="makecheck" suite="Examples">
+ <package>InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool</package>
<timelimit>10</timelimit>
<author> scott snyder </author>
<mailto> snyder@bnl.gov</mailto>
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
similarity index 93%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
index 1dc35caaac1facbdf8f3b1b9186d08d026d6d379..6db8fe96106bde1ee5119ac02a214a9cf8de0bd3 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
@@ -4,7 +4,7 @@
// $Id$
/**
- * @file InDetConditionsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
+ * @file InDetByteStreamErrorsAthenaPool/test/TRT_BSErrContainerCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
* @date Oct, 2015
* @brief Unit test
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
similarity index 94%
rename from InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
rename to InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
index acc18d19c71b2fd75e2f97a6b3bf6fdac6ab0497..126fb14b3117e29780f721ca2ef994a6c2f1b9ce 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
@@ -4,7 +4,7 @@
// $Id$
/**
- * @file InDetConditionsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
+ * @file InDetByteStreamErrorsAthenaPool/test/TRT_BSIdErrContainerCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
* @date Oct, 2015
* @brief Unit test
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
index 927587ee0cd744befb1fafe947aa7407534ad5f5..1af400f94b7c800be9545c2a6b97214461a9754c 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 726439 2016-02-26 14:46:58Z krasznaa $
################################################################################
# Package: InDetConditionsAthenaPool
################################################################################
@@ -10,13 +9,9 @@ atlas_subdir( InDetConditionsAthenaPool )
atlas_depends_on_subdirs(
PUBLIC
Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
PRIVATE
GaudiKernel
- AtlasTest/TestTools
- Control/DataModel
Database/AthenaPOOL/AthenaPoolCnvSvc
- InnerDetector/InDetConditions/InDetByteStreamErrors
InnerDetector/InDetConditions/TRT_ConditionsData )
# Component(s) in the package:
@@ -34,9 +29,6 @@ atlas_add_poolcnv_library( InDetConditionsAthenaPoolPoolCnv src/*.cxx
TRT_ConditionsData/StrawDxMultChanContainer.h
TRT_ConditionsData/StrawStatusMultChanContainer.h
TRT_ConditionsData/StrawStatusContainer.h
- InDetByteStreamErrors/InDetBSErrContainer.h
- InDetByteStreamErrors/TRT_BSIdErrContainer.h
- InDetByteStreamErrors/TRT_BSErrContainer.h
TYPES_WITH_NAMESPACE TRTCond::StrawT0Container
TRTCond::RtRelationContainer TRTCond::StrawDxContainer
TRTCond::StrawT0MultChanContainer TRTCond::RtRelationMultChanContainer
@@ -45,30 +37,14 @@ atlas_add_poolcnv_library( InDetConditionsAthenaPoolPoolCnv src/*.cxx
MULT_CHAN_TYPES TRTCond::StrawT0MultChanContainer
TRTCond::RtRelationMultChanContainer TRTCond::StrawDxMultChanContainer
TRTCond::StrawStatusMultChanContainer
- LINK_LIBRARIES AthenaPoolUtilities Identifier TestTools DataModel
+ LINK_LIBRARIES AthenaPoolUtilities
AthenaPoolCnvSvcLib TRT_ConditionsData )
atlas_add_dictionary( InDetConditionsAthenaPoolCnvDict
InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h
InDetConditionsAthenaPool/selection.xml
- LINK_LIBRARIES AthenaPoolUtilities Identifier TestTools DataModel
+ LINK_LIBRARIES AthenaPoolUtilities
AthenaPoolCnvSvcLib TRT_ConditionsData )
-# Tests in the package:
-atlas_add_test( InDetBSErrContainerCnv_p1_test
- SOURCES test/InDetBSErrContainerCnv_p1_test.cxx
- src/InDetBSErrContainerCnv_p1.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
-
-atlas_add_test( TRT_BSErrContainerCnv_p1_test
- SOURCES test/TRT_BSErrContainerCnv_p1_test.cxx
- src/TRT_BSErrContainerCnv_p1.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
-
-atlas_add_test( TRT_BSIdErrContainerCnv_p1_test
- SOURCES test/TRT_BSIdErrContainerCnv_p1_test.cxx
- src/TRT_BSIdErrContainerCnv_p1.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier DataModel )
-
# Install files from the package:
atlas_install_headers( InDetConditionsAthenaPool )
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h
index ba7259fb6942120c20b6e3e51d50e413122a456b..e011915ad041b898797fca1b976a07cb73443651 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h
+++ b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h
@@ -4,7 +4,4 @@
#ifndef INDCONDITIONSATHENAPOOLCNVDICT_H
#define INDCONDITIONSATHENAPOOLCNVDICT_H
-#include "InDetConditionsAthenaPool/InDetBSErrContainer_p1.h"
-#include "InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h"
-#include "InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h"
#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/selection.xml b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/selection.xml
index 4eb591742f02f12415b7efb8f7df2b1f373206ad..2eff49dff6688999d781e8922c8138fc7a36b1e8 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/selection.xml
+++ b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/InDetConditionsAthenaPool/selection.xml
@@ -1,5 +1,2 @@
<lcgdict>
- <class name="InDetBSErrContainer_p1" id="FA64DC17-D07E-4305-9B21-18C64F1B4C47" />
- <class name="TRT_BSErrContainer_p1" id="D461AC01-02CA-4A9E-886B-24EC14309121" />
- <class name="TRT_BSIdErrContainer_p1" id="26F44F1E-D1F5-43B3-93E9-09376AB37491" />
</lcgdict>
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/cmt/requirements b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/cmt/requirements
deleted file mode 100644
index 3b9bf55122c487aec4eca2ef5e3aba2e8a37cef9..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package InDetConditionsAthenaPool
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External
-use Identifier Identifier-* DetectorDescription
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-private
-use DataModel DataModel-* Control
-use InDetByteStreamErrors InDetByteStreamErrors-* InnerDetector/InDetConditions
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use TRT_ConditionsData TRT_ConditionsData-* InnerDetector/InDetConditions
-end_private
-
-
-apply_pattern poolcnv \
- typesWithNamespace="TRTCond::StrawT0Container TRTCond::RtRelationContainer TRTCond::StrawDxContainer TRTCond::StrawT0MultChanContainer TRTCond::RtRelationMultChanContainer TRTCond::StrawDxMultChanContainer TRTCond::StrawStatusMultChanContainer TRTCond::StrawStatusContainer"\
- multChanTypes=" TRTCond::StrawT0MultChanContainer TRTCond::RtRelationMultChanContainer TRTCond::StrawDxMultChanContainer TRTCond::StrawStatusMultChanContainer" \
- files=" -s=${TRT_ConditionsData_root}/TRT_ConditionsData TRTRtFloat.h TRTWeiFloat.h TRTAliFloat.h TRTStrawStatusData.h FloatArrayStore.h StrawT0Container.h RtRelationContainer.h StrawDxContainer.h StrawT0MultChanContainer.h RtRelationMultChanContainer.h StrawDxMultChanContainer.h StrawStatusMultChanContainer.h StrawStatusContainer.h \
- -s=${InDetByteStreamErrors_root}/InDetByteStreamErrors InDetBSErrContainer.h\
- -s=${InDetByteStreamErrors_root}/InDetByteStreamErrors TRT_BSIdErrContainer.h\
- -s=${InDetByteStreamErrors_root}/InDetByteStreamErrors TRT_BSErrContainer.h"
-
-
-macro_append InDetConditionsAthenaPoolPoolCnvGen_dependencies " InDetConditionsAthenaPoolCnvDict "
-apply_pattern lcgdict dict=InDetConditionsAthenaPoolCnv selectionfile=selection.xml headerfiles="../InDetConditionsAthenaPool/InDetConditionsAthenaPoolCnvDict.h"
-
-
-private
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=InDetBSErrContainerCnv_p1
-macro_append InDetBSErrContainerCnv_p1_test_use_linkopts " -lInDetConditionsAthenaPoolPoolCnv "
-
-apply_pattern UnitTest_run unit_test=TRT_BSErrContainerCnv_p1
-macro_append TRT_BSErrContainerCnv_p1_test_use_linkopts " -lInDetConditionsAthenaPoolPoolCnv "
-
-apply_pattern UnitTest_run unit_test=TRT_BSIdErrContainerCnv_p1
-macro_append TRT_BSIdErrContainerCnv_p1_test_use_linkopts " -lInDetConditionsAthenaPoolPoolCnv "
-
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.h
deleted file mode 100644
index 5344535a24ebd8ac1bbeff3af2c08b565615077f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/InDetBSErrContainerCnv_p1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef INDETBSERRCONTAINERCNV_P1_H
-#define INDETBSERRCONTAINERCNV_P1_H
-
-#include "InDetByteStreamErrors/InDetBSErrContainer.h"
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "InDetConditionsAthenaPool/InDetBSErrContainer_p1.h"
-
-
-class InDetBSErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<InDetBSErrContainer, InDetBSErrContainer_p1>
-{
- public:
- InDetBSErrContainerCnv_p1(){};
-
- virtual void persToTrans(const InDetBSErrContainer_p1* persCont,
- InDetBSErrContainer* transCont,
- MsgStream &log) ;
- virtual void transToPers(const InDetBSErrContainer* transCont,
- InDetBSErrContainer_p1* persCont,
- MsgStream &log) ;
- virtual InDetBSErrContainer* createTransient(const InDetBSErrContainer_p1* persObj, MsgStream& log) ;
-
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.h
deleted file mode 100644
index 0b153642a174bf58b7e8a2f1127e919c3c966043..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSErrContainerCnv_p1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRT_BSERRCONTAINERCNV_P1_H
-#define TRT_BSERRCONTAINERCNV_P1_H
-
-#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "InDetConditionsAthenaPool/TRT_BSErrContainer_p1.h"
-
-
-class TRT_BSErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<TRT_BSErrContainer, TRT_BSErrContainer_p1>
-{
- public:
- TRT_BSErrContainerCnv_p1(){};
-
- virtual void persToTrans(const TRT_BSErrContainer_p1* persCont,
- TRT_BSErrContainer* transCont,
- MsgStream &log) ;
- virtual void transToPers(const TRT_BSErrContainer* transCont,
- TRT_BSErrContainer_p1* persCont,
- MsgStream &log) ;
- virtual TRT_BSErrContainer* createTransient(const TRT_BSErrContainer_p1* persObj, MsgStream& log) ;
-
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h
deleted file mode 100644
index cc0d437c7beaa2d3357e999af24689678d2a5a03..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRT_BSIDERRCONTAINERCNV_P1_H
-#define TRT_BSIDERRCONTAINERCNV_P1_H
-
-#include "InDetByteStreamErrors/TRT_BSIdErrContainer.h"
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "InDetConditionsAthenaPool/TRT_BSIdErrContainer_p1.h"
-
-
-class TRT_BSIdErrContainerCnv_p1 : public T_AthenaPoolTPCnvBase<TRT_BSIdErrContainer, TRT_BSIdErrContainer_p1>
-{
- public:
- TRT_BSIdErrContainerCnv_p1(){};
-
- virtual void persToTrans(const TRT_BSIdErrContainer_p1* persCont,
- TRT_BSIdErrContainer* transCont,
- MsgStream &log) ;
- virtual void transToPers(const TRT_BSIdErrContainer* transCont,
- TRT_BSIdErrContainer_p1* persCont,
- MsgStream &log) ;
- virtual TRT_BSIdErrContainer* createTransient(const TRT_BSIdErrContainer_p1* persObj, MsgStream& log) ;
-
-};
-
-#endif
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 27035481523203a3ba7b8be4a2aba18303938c79..ea6cfebfc6c437ccee399fd751927fae1903d8a4 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -165,7 +165,6 @@
+ Generators/McEventSelector
+ Generators/TruthUtils
+ InnerDetector/InDetConditions/InDetBeamSpotService
-+ InnerDetector/InDetConditions/InDetByteStreamErrors
+ InnerDetector/InDetConditions/InDetCondFolders
+ InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetConditionsAthenaPool