Merge branch 'inst.TrkEventTPCnv-20220125' into 'master'

TrkEventTPCnv: Fix template instantation.

See merge request !49951

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -37,10 +37,7 @@ MeasuredNeutralAtaSurfaceCnv_p1< SURFACE_CNV, ATA_SURFACE >::transToPers( const
 
 
 
-namespace {
-   MeasuredNeutralAtaDiscCnv_p1	inst1;
-   MeasuredNeutralAtaCylinderCnv_p1	inst2;
-   MeasuredNeutralAtaPlaneCnv_p1	inst3;
-   MeasuredNeutralAtaStraightLineCnv_p1 isnt4;
-}
-
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaDiscCnv_p1, Trk::NeutralAtaDisc >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaCylinderCnv_p1, Trk::NeutralAtaCylinder >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaPlaneCnv_p1, Trk::NeutralAtaPlane >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaStraightLineCnv_p1, Trk::NeutralAtaStraightLine >;

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -15,10 +15,7 @@
 #include "TrkEventTPCnv/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.icc"
 
 
-namespace {
-   NeutralAtaDiscCnv_p1	inst1;
-   NeutralAtaCylinderCnv_p1	inst2;
-   NeutralAtaPlaneCnv_p1	inst3;
-   NeutralAtaStraightLineCnv_p1 isnt4;
-}
-
+template class NeutralAtaSurfaceCnv_p1< DiscSurfaceCnv_p1, Trk::NeutralAtaDisc >;
+template class NeutralAtaSurfaceCnv_p1< CylinderSurfaceCnv_p1, Trk::NeutralAtaCylinder >;
+template class NeutralAtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::NeutralAtaPlane >;
+template class NeutralAtaSurfaceCnv_p1< StraightLineSurfaceCnv_p1, Trk::NeutralAtaStraightLine >;

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/AtaSurfaceCnv_p1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -15,11 +15,8 @@
 #include "TrkEventTPCnv/TrkParameters/AtaSurfaceCnv_p1.icc"
 
 
-namespace {
-   AtaDiscCnv_p1	inst1;
-   AtaCylinderCnv_p1	inst2;
-   AtaPlaneCnv_p1	inst3;
-   AtaStraightLineCnv_p1 isnt4;
-   CurvilinearParametersCnv_p1 isnt5; 
-}
-
+template class AtaSurfaceCnv_p1< DiscSurfaceCnv_p1, Trk::AtaDisc >;
+template class AtaSurfaceCnv_p1< CylinderSurfaceCnv_p1, Trk::AtaCylinder >;
+template class AtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::AtaPlane >;
+template class AtaSurfaceCnv_p1< StraightLineSurfaceCnv_p1, Trk::AtaStraightLine >;
+template class AtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::CurvilinearParameters >;

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/MeasuredAtaSurfaceCnv_p1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -36,11 +36,8 @@ MeasuredAtaSurfaceCnv_p1< SURFACE_CNV, ATA_SURFACE >::transToPers( const ATA_SUR
 
 
 
-namespace {
-   MeasuredAtaDiscCnv_p1	inst1;
-   MeasuredAtaCylinderCnv_p1	inst2;
-   MeasuredAtaPlaneCnv_p1	inst3;
-   MeasuredAtaStraightLineCnv_p1 isnt4;
-   MeasuredCurvilinearParametersCnv_p1 isnt5; 
-}
-
+template class MeasuredAtaSurfaceCnv_p1< AtaDiscCnv_p1, Trk::AtaDisc >;
+template class MeasuredAtaSurfaceCnv_p1< AtaCylinderCnv_p1, Trk::AtaCylinder >;
+template class MeasuredAtaSurfaceCnv_p1< AtaPlaneCnv_p1, Trk::AtaPlane >;
+template class MeasuredAtaSurfaceCnv_p1< AtaStraightLineCnv_p1, Trk::AtaStraightLine >;
+template class MeasuredAtaSurfaceCnv_p1< CurvilinearParametersCnv_p1, Trk::CurvilinearParameters >; 

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/BoundSurfaceCnv_p1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -93,10 +93,7 @@ transToPers( const SURFACE *transObj, Trk::BoundSurface_p1 *persObj, MsgStream &
 }
 
 
-namespace {
-   DiscSurfaceCnv_p1		inst1;
-   CylinderSurfaceCnv_p1	inst2;
-   PlaneSurfaceCnv_p1		inst3;
-   StraightLineSurfaceCnv_p1	isnt4;
-}
-
+template class BoundSurfaceCnv_p1< Trk::DiscSurface, DiscBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::CylinderSurface, CylinderBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::StraightLineSurface, CylinderBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::PlaneSurface >;

Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/SurfaceCnv_p2.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -95,12 +95,10 @@ void SurfaceCnv_p2<Trk::SaggedLineSurface>::transToPers( const Trk::SaggedLineSu
   }   
 }
 
-namespace {
-  ConeSurfaceCnv_p2           inst1;
-  CylinderSurfaceCnv_p2       inst2;
-  DiscSurfaceCnv_p2           inst3;
-  PerigeeSurfaceCnv_p2        inst4;
-  PlaneSurfaceCnv_p2          inst5;
-  StraightLineSurfaceCnv_p2   inst6;
-  SaggedLineSurfaceCnv_p2     inst7;
-}
+template class SurfaceCnv_p2<Trk::ConeSurface>;
+template class SurfaceCnv_p2<Trk::CylinderSurface>;
+template class SurfaceCnv_p2<Trk::DiscSurface>; 
+template class SurfaceCnv_p2<Trk::PerigeeSurface>;
+template class SurfaceCnv_p2<Trk::PlaneSurface>;
+template class SurfaceCnv_p2<Trk::StraightLineSurface>;
+template class SurfaceCnv_p2<Trk::SaggedLineSurface>;