From 9d3c994edf596d05d59a9d7912ca37a85013242e Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Fri, 10 Jul 2020 19:10:35 +0100
Subject: [PATCH 1/2] RefittedTrackPair: Remove seemingly un-needed code
---
.../TrkTrack/TrkTrack/RefittedTrackPair.h | 53 -------------------
.../TrkTrack/RefittedTrackPairCollection.h | 25 ---------
.../TrkEvent/TrkTrack/TrkTrack/selection.xml | 8 +--
.../TrkTrack/src/RefittedTrackPair.cxx | 25 ---------
4 files changed, 2 insertions(+), 109 deletions(-)
delete mode 100755 Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPair.h
delete mode 100755 Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPairCollection.h
delete mode 100755 Tracking/TrkEvent/TrkTrack/src/RefittedTrackPair.cxx
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPair.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPair.h
deleted file mode 100755
index c6957903a6e8..000000000000
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPair.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/* ====================================================================================
- RefittedTrackPair.h - description
- -----------------------------------
-begin : Friday 30th March 2006
-author : Tom Atkinson
-email : t.atkinson@physics.unimelb.edu.au
-decription : Class holding an element link to a track and pointer to the
- refitted
-======================================================================================= */
-
-#ifndef TrkRefittedTrackPair_H
-#define TrkRefittedTrackPair_H
-
-#include "AthLinks/ElementLink.h"
-#include "TrkTrack/Track.h"
-#include "TrkTrack/TrackCollection.h"
-
-namespace Trk{
-
-/**
-
-@brief pair associating a refitted track to a track element link
-
- The RefittedTrack class is a pair.
- - The first element is an element link to the original track
- - The second element is a pointer to the refitted track
-
-@author t.atkinson@physics.unimelb.edu.au
-
-*/
-
-
-class RefittedTrackPair : public std::pair< ElementLink< DataVector< Track > >, Track* >{
- public:
-
- //!< Default constructor
- RefittedTrackPair();
-
- //!< Constructor using the element link to the original track and the pointer to the refitted track
- RefittedTrackPair( const ElementLink< DataVector< Track > >&, Track* );
-
- //!< Virtual destructor
- virtual ~RefittedTrackPair();
-
-};
-
-} // end Trk namespace
-
-#endif
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPairCollection.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPairCollection.h
deleted file mode 100755
index 6e8abb86c6fa..000000000000
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/RefittedTrackPairCollection.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/* ===============================================================================
- RefittedTrackPairCollection.h - description
- ---------------------------------------------
-begin : Friday 30th March 2006
-author : Tom Atkinson
-email : t.atkinson@physics.unimelb.edu.au
-decription : Collection of refitted track pairs
-================================================================================== */
-
-#ifndef TrkRefittedTrackPairCollection_H
-#define TrkRefittedTrackPairCollection_H
-
-#include "TrkTrack/RefittedTrackPair.h"
-
-#include "AthContainers/DataVector.h"
-
-typedef DataVector< Trk::RefittedTrackPair > RefittedTrackPairCollection;
-
-CLASS_DEF(RefittedTrackPairCollection, 1098918547, 1)
-
-#endif
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/selection.xml b/Tracking/TrkEvent/TrkTrack/TrkTrack/selection.xml
index f94dd4244308..f38e080cd1b1 100755
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/selection.xml
+++ b/Tracking/TrkEvent/TrkTrack/TrkTrack/selection.xml
@@ -9,6 +9,7 @@
<field name="m_trackStateVector" transient="false" />
<field name="s_numberOfInstantiations" transient="true" />
</class>
+
<class name="TrackCollection"/>
<class name="DataVector<Trk::Track>" id="70ECEBFC-BE00-46C2-8B35-4CC12D18DE39"/>
<class name="std::vector<Trk::Track*>" />
@@ -21,13 +22,8 @@
<class name="std::vector<const Trk::TrackStateOnSurface*>" />
<class name="Trk::AlignmentEffectsOnTrack"/>
- <!-- RefittedTrackPair -->
- <class name="DataVector< Trk::RefittedTrackPair >" id="0168FDD0-A582-40C5-9A47-A39452C09778" />
- <class name="std::vector< Trk::RefittedTrackPair* >" />
- <class name="Trk::RefittedTrackPair" />
-
<class name="Trk::LinkToTrack"/>
-
+
<class name="Trk::TrackInfo"/>
<exclusion>
<class name="Trk::TrackInfo">
diff --git a/Tracking/TrkEvent/TrkTrack/src/RefittedTrackPair.cxx b/Tracking/TrkEvent/TrkTrack/src/RefittedTrackPair.cxx
deleted file mode 100755
index 028017a59a8a..000000000000
--- a/Tracking/TrkEvent/TrkTrack/src/RefittedTrackPair.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/* ===============================================================================
- RefittedTrackPair.cxx - description
- -------------------------------------
-begin : Friday 30th March 2006
-author : Tom Atkinson
-email : t.atkinson@physics.unimelb.edu.au
-decription : Implementation code for the RefittedTrackPair class
-================================================================================== */
-
-#include "TrkTrack/RefittedTrackPair.h"
-
-Trk::RefittedTrackPair::RefittedTrackPair()= default;
-
-Trk::RefittedTrackPair::RefittedTrackPair( const ElementLink< DataVector< Trk::Track > >& originalTrack, Trk::Track* refittedTrack )
- :
- std::pair< ElementLink< DataVector< Trk::Track > >, Trk::Track* >( originalTrack, refittedTrack )
-{}
-
-Trk::RefittedTrackPair::~RefittedTrackPair()= default;
-
-
--
GitLab
From e6a75a36e887503d73de67a63614910fb644fd3c Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sat, 11 Jul 2020 00:19:41 +0100
Subject: [PATCH 2/2] rm include RefittedTrackPairCollection.h
---
Tracking/TrkEvent/TrkTrack/TrkTrack/TrkTrackDict.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrkTrackDict.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrkTrackDict.h
index 7208d93f57dd..145f667573d9 100755
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrkTrackDict.h
+++ b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrkTrackDict.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRKTRACKDICT_H
@@ -10,7 +10,6 @@
// #include is needed for gcc_xml to parse the header files
#include "TrkTrack/TrackStateOnSurface.h"
#include "TrkTrack/TrackCollection.h"
-#include "TrkTrack/RefittedTrackPairCollection.h"
#include "TrkTrack/LinkToTrack.h"
#include "Identifier/Identifier.h"
#include "AthLinks/ElementLink.h"
@@ -26,10 +25,11 @@ namespace Trk {
DataVector<const TrackStateOnSurface> m_trackStateVector;
DataVector<Identifier> m_identifierVector;
ElementLink<DataVector<Trk::Track> > m_Elink;
- std::bitset< 11 > m_dummy1;
+ std::bitset< 11 > m_dummy1;
TrackCollection m_tc;
ElementLink<TrackCollection> m_e1;
- std::vector<ElementLink<TrackCollection> > m_e2; //!< really for xAOD, but exposes dependency on TrkTrack to put it there...
+ //!< really for xAOD, but exposes dependency on TrkTrack to put it there...
+ std::vector<ElementLink<TrackCollection> > m_e2;
};
}
#endif
--
GitLab