Skip to content
Snippets Groups Projects
Commit 41eb85fb authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'ara_tpcnv' into 'main' 

AthenaKernel+AthenaServices: remove support for ARA TP converters

See merge request atlas/athena!76997
parents ca6aaed6 35727aa0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 112 deletions
Control/AthenaKernel/AthenaKernel/TPCnvFactory.h
+ 12
− 38
View file @ 41eb85fb
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TPCnvFactory.h 707243 2015-11-11 18:53:26Z ssnyder $
/**
* @file AthenaKernel/TPCnvFactory.h
......@@ -49,17 +48,6 @@
* Athena::TPCnvVers::Old)
@endcode
*
* Sometimes you need to use a different converter class for AthenaROOTAccess.
* In that case, also use @c DECLARE_ARATPCNV_FACTORY:
*
*@code
* #include "FooTPCnv/FooARACnv_p2.h"
* DECLARE_ARATPCNV_FACTORY(FooARACnv_p2,
* Foo,
* Foo_p2,
* Athena::TPCnvVers::Current)
@endcode
*
* There is a separate macro @c DECLARE_TRIGTPCNV_FACTORY to allow declaring
* separate converters to use for the trigger.
*
......@@ -71,14 +59,13 @@
*@code
* #include "FooTPCnv/BarCnv_p2.h"
* // BarCnv_p2 is actually a typedef.
* DECLARE_NAMED_ARATPCNV_FACTORY(BarCnv_p2,
* BarCnv_p2,
* Bar,
* Bar_p2,
* Athena::TPCnvVers::Current)
* DECLARE_NAMED_TPCNV_FACTORY(BarCnv_p2,
* BarCnv_p2,
* Bar,
* Bar_p2,
* Athena::TPCnvVers::Current)
@endcode
*
* There is also a @c DECLARE_NAMED_ARATPCNV_FACTORY.
*
* Implementation
* ==============
......@@ -86,13 +73,12 @@
* The implementation is very simple. Let the converter, transient,
* and persistent types be C, T, and P, respectively. We always make
* plugin entries for C and _PERS_P. If the converter is current,
* we also make an entry for _TRANS_T. If the converter is for ARA,
* we add _ARA t the front of the pers and trans names; and similarly
* _TRIG for trigger-specific conversions.
* we also make an entry for _TRANS_T. If the converter is for _TRIG,
* we add _TRIG to the front of the pers and trans names.
*
* Thus, to find the correct converter for a transient class, we look up
* _TRANS_T; and for a persistent class we look up _PERS_P. For ARA,
* we first try the look up with _ARA in front of those names.
* _TRANS_T; and for a persistent class we look up _PERS_P. For TRIG,
* we first try the look up with _TRIG in front of those names.
* To get the transient class name corresponding to a persistent class,
* we create an instance of the converter and use the @c transientTInfo
* interface. No registry is needed beyond the existing Gaudi plugin registry.
......@@ -121,7 +107,7 @@ namespace Athena {
struct TPCnvType {
enum Value {
Athena = 0,
ARA = 1,
// ARA = 1, // not supported anymore
Trigger = 2
};
};
......@@ -144,9 +130,7 @@ namespace Athena {
{ \
using ::Gaudi::PluginService::DeclareFactory; \
std::string prefix; \
if (cnv_type == Athena::TPCnvType::ARA) \
prefix = "_ARA"; \
else if (cnv_type == Athena::TPCnvType::Trigger) \
if (cnv_type == Athena::TPCnvType::Trigger) \
prefix = "_TRIG"; \
DeclareFactory<type> normal{}; \
if (is_last_version == Athena::TPCnvVers::Current) \
......@@ -164,15 +148,11 @@ namespace Athena {
#define ATHTPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, Athena::TPCnvType::Athena, signature, __LINE__)
#define ARATPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, Athena::TPCnvType::ARA, signature, __LINE__)
#define TRIGTPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY(type, trans_type, pers_type, is_last_version, Athena::TPCnvType::Trigger, signature, __LINE__)
#define ATHTPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, Athena::TPCnvType::Athena, signature, __LINE__)
#define ARATPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, Athena::TPCnvType::ARA, signature, __LINE__)
#define TRIGTPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, signature) \
DO_ATHTPCNV_PLUGINSVC_FACTORY_WITH_ID(type, id, trans_type, pers_type, is_last_version, Athena::TPCnvType::Trigger, signature, __LINE__)
......@@ -185,18 +165,12 @@ namespace Athena {
#define DECLARE_TPCNV_FACTORY(x,trans_type,pers_type,is_last_version) \
ATHTPCNV_PLUGINSVC_FACTORY(x,trans_type,pers_type,is_last_version,ITPCnvBase*())
#define DECLARE_ARATPCNV_FACTORY(x,trans_type,pers_type,is_last_version) \
ARATPCNV_PLUGINSVC_FACTORY(x,trans_type,pers_type,is_last_version,ITPCnvBase*())
#define DECLARE_TRIGTPCNV_FACTORY(x,trans_type,pers_type,is_last_version) \
TRIGTPCNV_PLUGINSVC_FACTORY(x,trans_type,pers_type,is_last_version,ITPCnvBase*())
#define DECLARE_NAMED_TPCNV_FACTORY(x,n,trans_type,pers_type,is_last_version) \
ATHTPCNV_PLUGINSVC_FACTORY_WITH_ID(x,std::string(#n), trans_type,pers_type, is_last_version, ITPCnvBase*())
#define DECLARE_NAMED_ARATPCNV_FACTORY(x,n,trans_type,pers_type,is_last_version) \
ARATPCNV_PLUGINSVC_FACTORY_WITH_ID(x,std::string(#n), trans_type,pers_type, is_last_version, ITPCnvBase*())
#define DECLARE_NAMED_TRIGTPCNV_FACTORY(x,n,trans_type,pers_type,is_last_version) \
TRIGTPCNV_PLUGINSVC_FACTORY_WITH_ID(x,std::string(#n), trans_type,pers_type, is_last_version, ITPCnvBase*())
......
Control/AthenaServices/src/AthTPCnvSvc.cxx
+ 1
− 3
View file @ 41eb85fb
///////////////////////// -*- C++ -*- /////////////////////////////
/*
Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// AthTPCnvSvc.cxx
......@@ -19,8 +19,6 @@ std::string prefix (Athena::TPCnvType::Value type)
{
switch (type)
{
case Athena::TPCnvType::ARA:
return "_ARA";
case Athena::TPCnvType::Trigger:
return "_TRIG";
default:
......
Control/AthenaServices/src/test/testConverters.cxx
+ 1
− 6
View file @ 41eb85fb
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// Dummy converters for testing AthTPCnvSvc
......@@ -45,7 +45,6 @@ class TestConverter_TA_PA1 : public TestConverterBase {};
class TestConverter_TA_PA2 : public TestConverterBase {};
class TestConverter_TB_PB1 : public TestConverterBase {};
class TestConverter_TB_PB1_ARA : public TestConverterBase {};
class TestConverter_TBTRIG_PB1 : public TestConverterBase {};
......@@ -66,10 +65,6 @@ DECLARE_TPCNV_FACTORY (AthenaServicesTestConverters::TestConverter_TB_PB1,
AthenaServicesTestConverters::TB,
AthenaServicesTestConverters::PB1,
Athena::TPCnvVers::Current)
DECLARE_ARATPCNV_FACTORY (AthenaServicesTestConverters::TestConverter_TB_PB1_ARA,
AthenaServicesTestConverters::TB,
AthenaServicesTestConverters::PB1,
Athena::TPCnvVers::Current)
DECLARE_TRIGTPCNV_FACTORY (AthenaServicesTestConverters::TestConverter_TBTRIG_PB1,
AthenaServicesTestConverters::TBTRIG,
AthenaServicesTestConverters::PB1,
......
Control/AthenaServices/test/AthTPCnvSvc_test.py
+ 1
− 9
View file @ 41eb85fb
#!/usr/bin/env python
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Unit test for AthTPCnvSvc
from AthenaPython import PyAthena
......@@ -54,8 +54,6 @@ assert getname(tpsvc.t2p_cnv(20394828,2)) == \
assert getname(tpsvc.t2p_cnv('AthenaServicesTestConverters::TB')) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
assert getname(tpsvc.t2p_cnv('AthenaServicesTestConverters::TB',1)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1_ARA'
assert getname(tpsvc.t2p_cnv('AthenaServicesTestConverters::TB',2)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
......@@ -68,22 +66,16 @@ assert getname(tpsvc.t2p_cnv('AthenaServicesTestConverters::TBTRIG',2)) == \
assert getname(tpsvc.p2t_cnv('AthenaServicesTestConverters::PB1')) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
assert getname(tpsvc.p2t_cnv('AthenaServicesTestConverters::PB1',1)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1_ARA'
assert getname(tpsvc.p2t_cnv('AthenaServicesTestConverters::PB1',2)) == \
'AthenaServicesTestConverters::TestConverter_TBTRIG_PB1'
assert getname(tpsvc.t2p_cnv(20394827)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
assert getname(tpsvc.t2p_cnv(20394827,1)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1_ARA'
assert getname(tpsvc.t2p_cnv(20394827,2)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
assert getname(tpsvc.t2p_cnv(20394826)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
assert getname(tpsvc.t2p_cnv(20394826,1)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1_ARA'
assert getname(tpsvc.t2p_cnv(20394826,2)) == \
'AthenaServicesTestConverters::TestConverter_TB_PB1'
......
PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/factories/McParticleEventTPCnv.cxx
+ 1
− 16
View file @ 41eb85fb
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// generate the T/P converter entries
......@@ -35,18 +35,3 @@ DECLARE_TPCNV_FACTORY(TruthParticleContainerCnv_p6,
TruthParticleContainer,
TruthParticleContainer_p6,
Athena::TPCnvVers::Current)
typedef T_TPCnv<TruthParticleContainer, TruthParticleContainer_p5>
RootTruthParticleContainerCnv_p5;
DECLARE_ARATPCNV_FACTORY(RootTruthParticleContainerCnv_p5,
TruthParticleContainer,
TruthParticleContainer_p5,
Athena::TPCnvVers::Old)
typedef T_TPCnv<TruthParticleContainer, TruthParticleContainer_p6>
RootTruthParticleContainerCnv_p6;
DECLARE_ARATPCNV_FACTORY(RootTruthParticleContainerCnv_p6,
TruthParticleContainer,
TruthParticleContainer_p6,
Athena::TPCnvVers::Current)
Reconstruction/TrackParticleTPCnv/src/factories/TrackParticleTPCnv.cxx
+ 1
− 20
View file @ 41eb85fb
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// generate the T/P converter entries
......@@ -20,31 +20,12 @@ DECLARE_TPCNV_FACTORY(TrackParticleContainerCnv_tlp1,
Rec::TrackParticleContainer_tlp1,
Athena::TPCnvVers::Old)
DECLARE_ARATPCNV_FACTORY(TrackParticleContainerARACnv_tlp1,
Rec::TrackParticleContainer,
Rec::TrackParticleContainer_tlp1,
Athena::TPCnvVers::Old)
//----------------
DECLARE_TPCNV_FACTORY(TrackParticleContainerCnv_tlp2,
Rec::TrackParticleContainer,
Rec::TrackParticleContainer_tlp2,
Athena::TPCnvVers::Old)
DECLARE_ARATPCNV_FACTORY(TrackParticleContainerARACnv_tlp2,
Rec::TrackParticleContainer,
Rec::TrackParticleContainer_tlp2,
Athena::TPCnvVers::Old)
//----------------
DECLARE_TPCNV_FACTORY(TrackParticleContainerCnv_tlp3,
Rec::TrackParticleContainer,
Rec::TrackParticleContainer_tlp3,
Athena::TPCnvVers::Current)
DECLARE_ARATPCNV_FACTORY(TrackParticleContainerARACnv_tlp3,
Rec::TrackParticleContainer,
Rec::TrackParticleContainer_tlp3,
Athena::TPCnvVers::Current)
Tracking/TrkEventCnv/TrkEventTPCnv/src/factories/TrkEventTPCnv.cxx
+ 1
− 14
View file @ 41eb85fb
/*
Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// generate the T/P converter entries
......@@ -204,16 +204,3 @@ DECLARE_TPCNV_FACTORY(TrackCollectionCnv_p4,
TrackCollection,
Trk::TrackCollection_p4,
Athena::TPCnvVers::Old)
using VxContainerARACnv_tlp1 = T_TPCnv<VxContainer, Trk::VxContainer_tlp1>;
DECLARE_ARATPCNV_FACTORY(VxContainerARACnv_tlp1,
VxContainer,
Trk::VxContainer_tlp1,
Athena::TPCnvVers::Old)
using VxContainerARACnv_tlp2 = T_TPCnv<VxContainer, Trk::VxContainer_tlp2>;
DECLARE_ARATPCNV_FACTORY(VxContainerARACnv_tlp2,
VxContainer,
Trk::VxContainer_tlp2,
Athena::TPCnvVers::Current)
Trigger/TrigEvent/TrigInDetEventTPCnv/src/factories/TrigInDetEventTPCnv.cxx
+ 1
− 6
View file @ 41eb85fb
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
// generate the T/P converter entries
......@@ -142,11 +142,6 @@ DECLARE_TPCNV_FACTORY(TrigInDetTrackCollectionCnv_tlp3,
TrigInDetTrackCollection_tlp3,
Athena::TPCnvVers::Old)
DECLARE_ARATPCNV_FACTORY(TrigInDetTrackCollectionCnvARA_tlp3,
TrigInDetTrackCollection,
TrigInDetTrackCollection_tlp3,
Athena::TPCnvVers::Old)
DECLARE_TPCNV_FACTORY(TrigInDetTrackCollectionCnv_tlp4,
TrigInDetTrackCollection,
TrigInDetTrackCollection_tlp4,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment