diff --git a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt index e1144f32924966cd44400b469c5738daa90f15c8..da584aacb5a5ccd6aedd05ab7d2ff98234aefee6 100644 --- a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt +++ b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt @@ -39,7 +39,7 @@ atlas_add_dictionary( DataModelTestDataCommonDict atlas_add_sercnv_library ( DataModelTestDataCommonSerCnv - FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CAuxContainer.h - TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CAuxContainer - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} + FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CView.h DataModelTestDataCommon/CAuxContainer.h + TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CView DMTest::CAuxContainer + INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommon ) diff --git a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml index b90f9ea52784973ed1029867906d8951c654b6c0..46c8ebbdccb6cc48237405b2bafffbf4edb81287 100755 --- a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml +++ b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml @@ -31,5 +31,6 @@ <function name="DMTest::setPluginLibrary"/> <function name="DMTest::setConverterLibrary"/> + <function name="DMTest::setTrigConverterLibrary"/> </lcgdict> diff --git a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/setConverterLibrary.h b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/setConverterLibrary.h index 189f304fefbd65dcfc7a871f6b65fcc093a44d2e..2714fda61919385957497fbce83a2526624be339 100644 --- a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/setConverterLibrary.h +++ b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/setConverterLibrary.h @@ -27,6 +27,8 @@ namespace DMTest { void setPluginLibrary (const std::string& name, const std::string& lib); void setConverterLibrary (CLID clid, const std::string& lib); void setConverterLibrary (const std::string& lib); +void setTrigConverterLibrary (CLID clid, const std::string& lib); +void setTrigConverterLibrary (const std::string& lib); } // namespace DMTest diff --git a/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements b/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements index c30d3e04e1faa0072c72865cc6728c00f9e2672d..b5ec5dfe1d38aa2346ee52547d60bb8f3c08be08 100755 --- a/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements +++ b/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements @@ -42,6 +42,6 @@ use TrigSerializeUtils TrigSerializeUtils-* Trigger/TrigDataAccess apply_pattern sercnv \ - typesWithNamespace="DMTest::CVec DMTest::CAuxContainer" \ + typesWithNamespace="DMTest::CVec DMTest::CView DMTest::CAuxContainer" \ files=" -s=${DataModelTestDataCommon_root}/DataModelTestDataCommon \ - CVec.h CAuxContainer.h " + CVec.h CView.h CAuxContainer.h " diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/setConverterLibrary.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/setConverterLibrary.cxx index df17866f70f36d5f27eebf7e31b23a3c4077e66c..1ba26094914849d6df6fce7f46c38a19549386d8 100644 --- a/Control/DataModelTest/DataModelTestDataCommon/src/setConverterLibrary.cxx +++ b/Control/DataModelTest/DataModelTestDataCommon/src/setConverterLibrary.cxx @@ -62,6 +62,23 @@ void setConverterLibrary (const std::string& lib) setConverterLibrary (9742, lib); // DMTest::GAuxContainer_v1 setConverterLibrary (9744, lib); // DMTest::G_v1 setConverterLibrary (9779, lib); // DMTest::CView_v1 + setPluginLibrary ("_PERS_DMTest::HVec_v1", lib); + setPluginLibrary ("_PERS_DataVector<DMTest::H_v1>", lib); +} + + +void setTrigConverterLibrary (CLID clid, const std::string& lib) +{ + std::string name = "CNV_81_" + std::to_string (clid); + setPluginLibrary (name, lib); +} + + +void setTrigConverterLibrary (const std::string& lib) +{ + setTrigConverterLibrary (9781, lib); // DMTest::HVec + setTrigConverterLibrary (9782, lib); // DMTest::HAuxContainer + setTrigConverterLibrary (9787, lib); // DMTest::HView }