diff --git a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
index a1e966310951471acfac32ef0bdd07e79c65fd26..e3e1bd851b8c4618af5e80177c6f0ba45832046c 100644
--- a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// Misc includes
@@ -30,9 +30,9 @@ namespace xAOD {
if(!hasStore() ) makePrivateStore();
this->IParticle::operator=( tp );
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
m_perigeeParameters.reset();
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
return *this;
}
@@ -107,11 +107,11 @@ namespace xAOD {
}
void NeutralParticle_v1::setDefiningParameters(float d0, float z0, float phi0, float theta, float oneOverP) {
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
if(m_perigeeParameters.isValid()) {
m_perigeeParameters.reset();
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
static const Accessor< float > acc1( "d0" );
acc1( *this ) = d0;
@@ -131,11 +131,11 @@ namespace xAOD {
}
void NeutralParticle_v1::setDefiningParametersCovMatrix(const xAOD::ParametersCovMatrix_t& cov){
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
if(m_perigeeParameters.isValid()) {
m_perigeeParameters.reset();
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
std::vector<float>& v = acc(*this);
@@ -184,7 +184,7 @@ namespace xAOD {
acc3( *this ) = z;
}
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
const Trk::NeutralPerigee& NeutralParticle_v1::perigeeParameters() const {
// Require the cache to be valid and check if the cached pointer has been set
@@ -210,12 +210,12 @@ namespace xAOD {
m_perigeeParameters.set(tmpPerigeeParameters);
return *(m_perigeeParameters.ptr());
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
void NeutralParticle_v1::resetCache() {
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
m_perigeeParameters.reset();
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
}
} // namespace xAOD
diff --git a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
index 293206b7db312f7f7dcf1c7276cd22304848c209..862de111f020e9a736bb487482d0b3e350857406 100644
--- a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
@@ -61,10 +61,10 @@ namespace xAOD {
makePrivateStore();
}
this->IParticle::operator=( tp );
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
// assume that this copy will create new cache as needed
m_perigeeParameters.reset();
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
return *this;
}
@@ -149,12 +149,12 @@ namespace xAOD {
}
void TrackParticle_v1::setDefiningParameters(float d0, float z0, float phi0, float theta, float qOverP) {
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
// reset perigee cache if existing
if(m_perigeeParameters.isValid()) {
m_perigeeParameters.reset();
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
static const Accessor< float > acc1( "d0" );
acc1( *this ) = d0;
@@ -180,12 +180,12 @@ namespace xAOD {
void TrackParticle_v1::setDefiningParametersCovMatrix(const xAOD::ParametersCovMatrix_t& cov){
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
// reset perigee cache if existing
if(m_perigeeParameters.isValid()) {
m_perigeeParameters.reset();
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
// Extract the diagonal elements from the matrix.
std::vector< float > diagVec;
@@ -437,7 +437,7 @@ namespace xAOD {
acc3( *this ) = z;
}
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
const Trk::Perigee& TrackParticle_v1::perigeeParameters() const {
// Require the cache to be valid and check if the cached pointer has been set
@@ -470,7 +470,7 @@ namespace xAOD {
m_perigeeParameters.set(tmpPerigeeParameters);
return *(m_perigeeParameters.ptr());
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
AUXSTORE_PRIMITIVE_GETTER(TrackParticle_v1, float, chiSquared)
AUXSTORE_PRIMITIVE_GETTER(TrackParticle_v1, float, numberDoF)
@@ -615,8 +615,8 @@ namespace xAOD {
acc( *this ).at(index) = static_cast<uint8_t>(pos);
}
-#ifndef XAOD_STANDALONE
- const Trk::CurvilinearParameters TrackParticle_v1::curvilinearParameters(unsigned int index) const {
+#ifndef XAOD_ANALYSIS
+ const Trk::CurvilinearParameters TrackParticle_v1::curvilinearParameters(unsigned int index) const {
static const Accessor< std::vector<float> > acc( "trackParameterCovarianceMatrices" );
unsigned int offset = index*15;
@@ -631,7 +631,7 @@ namespace xAOD {
return param;
}
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST(TrackParticle_v1, uint8_t, xAOD::TrackProperties,trackProperties)
AUXSTORE_PRIMITIVE_SETTER_WITH_CAST(TrackParticle_v1, uint8_t, xAOD::TrackProperties,trackProperties, setTrackProperties)
@@ -687,7 +687,7 @@ namespace xAOD {
}
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
/// The function will return an invalid ElementLink in case nothing was set
/// for it yet. This is to avoid users having to always check both for
/// the decoration being available, and the link being valid.
@@ -733,13 +733,13 @@ namespace xAOD {
}
return *( acc( *this ) );
- }
-#endif // not XAOD_STANDALONE
-
+ }
+#endif // not XAOD_ANALYSIS
+
void TrackParticle_v1::resetCache(){
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
m_perigeeParameters.reset();
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
}
} // namespace xAOD
diff --git a/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx b/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
index 3569fe59887aba3b09c9ea1207a3cc88da811db3..85c9c4d601056a8d084f805f9ea0e0f85d4f8f22 100644
--- a/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
@@ -18,12 +18,12 @@ namespace xAOD {
Vertex_v1::Vertex_v1()
: SG::AuxElement(),
- m_position(),
+ m_position(),
m_covariance() {
}
- Vertex_v1::Vertex_v1( const Vertex_v1& other )
+ Vertex_v1::Vertex_v1( const Vertex_v1& other )
: SG::AuxElement(other),
m_position( other.m_position ),
m_covariance( other.m_covariance ){
@@ -157,7 +157,7 @@ namespace xAOD {
AUXSTORE_PRIMITIVE_SETTER_WITH_CAST( Vertex_v1, short, VxType::VertexType,
vertexType, setVertexType )
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
+#ifndef XAOD_ANALYSIS
/// Helper object for implementing the vxTrackAtVertex functions
static const SG::AuxElement::Accessor< std::vector< Trk::VxTrackAtVertex > >
vxVertAcc( "vxTrackAtVertex" );
@@ -202,7 +202,7 @@ namespace xAOD {
return vxVertAcc.isAvailable( *this );
}
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+#endif // not XAOD_ANALYSIS
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/Event/xAOD/xAODTracking/xAODTracking/ParticleCaloExtension.h b/Event/xAOD/xAODTracking/xAODTracking/ParticleCaloExtension.h
index 2e403e4086713ec2d44ac40c10ea2feb0e50d233..374b4fbda9ca1f0a1f5fa81a0812a7b9d5e2f1df 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/ParticleCaloExtension.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/ParticleCaloExtension.h
@@ -1,19 +1,17 @@
/*
- 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 XAOD_PARTICLECALOEXTENSION_H
+#ifndef XAOD_PARTICLECALOEXTENSION_H
#define XAOD_PARTICLECALOEXTENSION_H
-#include "xAODTracking/TrackingPrimitives.h"
+#include "xAODTracking/TrackingPrimitives.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
-#ifndef XAOD_STANDALONE
-#ifndef XAOD_MANACORE
+#ifndef XAOD_ANALYSIS
// Athena includes
#include "TrkParameters/TrackParameters.h"
-#endif // not XAOD_MANACORE
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
#include <vector>
class CaloCell;
@@ -24,9 +22,9 @@ namespace xAOD {
class ParticleCaloExtension {
public:
/** constructor taking calo extrapolation as input. All vectors should be of the same length */
- ParticleCaloExtension( float charge,
- std::vector<std::vector<float> >&& parameters,
- std::vector<std::vector<float> >&& parametersCovariance,
+ ParticleCaloExtension( float charge,
+ std::vector<std::vector<float> >&& parameters,
+ std::vector<std::vector<float> >&& parametersCovariance,
std::vector<int>&& identifiers );
/** destructor */
@@ -38,8 +36,8 @@ namespace xAOD {
/** no assignment operator */
ParticleCaloExtension& operator=(const ParticleCaloExtension&) = delete;
- /// Returns the number of additional parameters stored in the Particle.
- size_t numberOfParameters() const;
+ /// Returns the number of additional parameters stored in the Particle.
+ size_t numberOfParameters() const;
/// Returns the track parameter vector at 'index'.
const CurvilinearParameters_t trackParameters(unsigned int index) const;
@@ -50,11 +48,11 @@ namespace xAOD {
/// @brief fill the matrix with the covariance at position 'index', returns false if the parameters at 'index' does not have a covariance
bool trackParameterCovarianceMatrix(ParametersCovMatrix_t& matrix, unsigned int index) const;
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
+#ifndef XAOD_ANALYSIS
/// @brief Returns a curvilinear representation of the parameters at 'index'.
- /// @note This is only available in Athena.
- const Trk::CurvilinearParameters curvilinearParameters(unsigned int index) const;
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+ /// @note This is only available in Athena.
+ const Trk::CurvilinearParameters curvilinearParameters(unsigned int index) const;
+#endif // not XAOD_ANALYSIS
/** return whether cells were already associated or not */
bool cellsAreAssociated() const;
@@ -77,13 +75,13 @@ namespace xAOD {
/// identifiers of the intersections with detector layers
std::vector<int> m_identifiers;
-
+
/** cell information */
bool m_cellsAreSet; // bool to store whether already set
std::vector<CaloCell*> m_caloCells; // vector of cells
};
- /// Returns the number of additional parameters stored in the Particle.
+ /// Returns the number of additional parameters stored in the Particle.
inline size_t ParticleCaloExtension::numberOfParameters() const {
return m_parameters.size();
}
@@ -94,7 +92,7 @@ namespace xAOD {
tmp << m_parameters[index][0],m_parameters[index][1],m_parameters[index][2],
m_parameters[index][3],m_parameters[index][4],m_parameters[index][5];
return tmp;
- }
+ }
inline bool ParticleCaloExtension::trackParameterCovarianceMatrix(ParametersCovMatrix_t& cov, unsigned int index) const {
const std::vector<float>& covVec = m_parametersCovariance[index];
@@ -105,12 +103,12 @@ namespace xAOD {
}
return true;
}
-
+
/// @brief Return the ParameterPosition of the parameters at 'index'.
inline int ParticleCaloExtension::parameterIdentifier(unsigned int index) const {
return m_identifiers[index];
}
-
+
inline bool ParticleCaloExtension::cellsAreAssociated() const {
return m_cellsAreSet;
}
@@ -124,13 +122,13 @@ namespace xAOD {
m_cellsAreSet=true;
}
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- inline const Trk::CurvilinearParameters ParticleCaloExtension::curvilinearParameters(unsigned int index) const {
+#ifndef XAOD_ANALYSIS
+ inline const Trk::CurvilinearParameters ParticleCaloExtension::curvilinearParameters(unsigned int index) const {
// copy the correct values into the temp matrix
ParametersCovMatrix_t* cov = 0;
if( !m_parametersCovariance[index].empty() ) {
- cov = new ParametersCovMatrix_t();
+ cov = new ParametersCovMatrix_t();
trackParameterCovarianceMatrix(*cov,index);
}
// retrieve the parameters to build the curvilinear frame
@@ -140,7 +138,7 @@ namespace xAOD {
return param;
}
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+#endif // not XAOD_ANALYSIS
}
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticleAuxContainer_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticleAuxContainer_v1.h
index 2471aad6d1d16a7fb908e020b9c94ee36806adc1..da942e9e4bd82ac7b2ba80f3c9f5cc43245ec517 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticleAuxContainer_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticleAuxContainer_v1.h
@@ -1,31 +1,19 @@
// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id: NeutralParticleAuxContainer_v1.h 573493 2013-12-03 13:05:51Z salzburg $
#ifndef XAODTRACKING_VERSIONS_NEUTRALPARTICLEAUXCONTAINER_V1_H
#define XAODTRACKING_VERSIONS_NEUTRALPARTICLEAUXCONTAINER_V1_H
-
+
// System include(s):
#include <stdint.h>
#include <vector>
-
+
// EDM include(s):
#include "xAODCore/AuxContainerBase.h"
-#include "AthLinks/ElementLink.h"
-#ifndef XAOD_STANDALONE
-#ifndef XAOD_MANACORE
-#include "TrkTrack/TrackCollection.h"
-#endif // not XAOD_MANACORE
-#endif // not XAOD_STANDALONE
-
-// Want to be able to switch this off and on for the moment
-//#define XAODTRACKING_SUMMARYDYNAMIC
namespace xAOD {
-
+
/// Temporary container used until we have I/O for AuxStoreInternal
///
/// This class is meant to serve as a temporary way to provide an auxiliary
@@ -35,17 +23,17 @@ namespace xAOD {
/// @author Andreas Salzburger
///
class NeutralParticleAuxContainer_v1 : public AuxContainerBase {
-
+
public:
/// Default constructor
NeutralParticleAuxContainer_v1();
-
+
private:
/// Dumps contents (for debugging)
void dump() const;
-
+
/// @name Defining parameters (perigee)
- /// @{
+ /// @{
std::vector< float > d0;
std::vector< float > z0;
std::vector< float > phi;
@@ -57,12 +45,11 @@ namespace xAOD {
std::vector< float > vx;
std::vector< float > vy;
std::vector< float > vz;
-
}; // class NeutralParticleAuxContainer_v1
-
+
} // namespace xAOD
-
+
#include "xAODCore/BaseInfo.h"
SG_BASE( xAOD::NeutralParticleAuxContainer_v1, xAOD::AuxContainerBase );
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
index e35519f6576b881f78ed32615e036b6800a3a29c..ed8187a3a2ac375bd6f2cd20917fc577af9a321a 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODTRACKING_VERSIONS_NEUTRALPARTICLE_V1_H
@@ -15,15 +15,15 @@
// xAOD include(s):
#include "xAODBase/IParticle.h"
-#include "xAODTracking/TrackingPrimitives.h"
-#include "xAODTracking/VertexContainerFwd.h"
+#include "xAODTracking/TrackingPrimitives.h"
+#include "xAODTracking/VertexContainerFwd.h"
#include <bitset>
#include <stdint.h>
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
#include "TrkNeutralParameters/NeutralParameters.h"
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
// ROOT include(s):
#include "Math/Vector4D.h"
@@ -36,7 +36,7 @@ namespace xAOD {
///
/// @author Andreas Salzburger <Andreas.Salzburger@cern.ch>
/// @nosubgrouping
-
+
class NeutralParticle_v1 : public IParticle {
public:
@@ -49,7 +49,7 @@ namespace xAOD {
NeutralParticle_v1(const NeutralParticle_v1& o );
/// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
NeutralParticle_v1& operator=(const NeutralParticle_v1& tp );
-
+
/// @name xAOD::IParticle functions
/// @{
/// The transverse momentum (\f$p_T\f$) of the particle.
@@ -64,10 +64,10 @@ namespace xAOD {
virtual double e() const;
/// The true rapidity (y) of the particle.
virtual double rapidity() const;
-
+
/// Definition of the 4-momentum type.
typedef IParticle::FourMom_t FourMom_t;
-
+
/// The full 4-momentum of the particle.
virtual FourMom_t p4() const;
@@ -76,11 +76,11 @@ namespace xAOD {
/// The full 4-momentum of the particle : GenVector form
GenVecFourMom_t genvecP4() const;
-
+
/// The type of the object as a simple enumeration
virtual Type::ObjectType type() const;
/// @}
-
+
/// @name Defining parameters functions
/// The 'defining parameters' are key to the concept of a NeutralParticle, and give the values for the IParticle interface
/// ( pt(), phi(), eta() etc.).
@@ -89,7 +89,7 @@ namespace xAOD {
/// The parameters are expressed with respect to an origin (returned by vx(), vy() and vy() ), currently intended to be the 'beamspot'.
/// This origin is expected to be the same for all track particles in a collection (and this may be be enforced).
/// @{
-
+
/// Returns the \f$d_0\f$ parameter
float d0() const;
/// Returns the \f$z_0\f$ parameter
@@ -100,22 +100,22 @@ namespace xAOD {
float theta() const;
/// Returns the \f$q/p\f$ parameter
float oneOverP() const;
- /// @brief Returns a SVector of the Perigee track parameters.
+ /// @brief Returns a SVector of the Perigee track parameters.
/// i.e. a vector of
/// \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\q/p\end{array}\right)\f$
const DefiningParameters_t definingParameters() const;
/// Returns the 5x5 symmetric matrix containing the defining parameters covariance matrix.
- const ParametersCovMatrix_t definingParametersCovMatrix() const;
+ const ParametersCovMatrix_t definingParametersCovMatrix() const;
/// Returns the vector of the covariance values - 15 elements
const std::vector<float>& definingParametersCovMatrixVec() const;
-
- /// Set the defining parameters.
+
+ /// Set the defining parameters.
void setDefiningParameters(float d0, float z0, float phi0, float theta, float qOverP);
/// Set the defining parameters covariance matrix.
void setDefiningParametersCovMatrix(const ParametersCovMatrix_t& cov);
/// Set the defining parameters covariance matrix using a length 15 vector.
void setDefiningParametersCovMatrixVec(const std::vector<float>& cov);
-
+
/// The x origin for the parameters.
float vx() const;
/// The y origin for the parameters.
@@ -125,24 +125,24 @@ namespace xAOD {
/// Set the origin for the parameters.
void setParametersOrigin(float x, float y, float z);
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
/// @brief Returns the Trk::NeutralPerigee track parameters.
///
/// These are defined as:
/// \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\1/p\\\end{array}\right)\f$
- /// @note This is only available in Athena.
+ /// @note This is only available in Athena.
const Trk::NeutralPerigee& perigeeParameters() const;
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
/// Reset the internal cache of the object
void resetCache();
-
+
private:
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(__CLING__) )
+#if ( ! defined(XAOD_ANALYSIS) ) && ( ! defined(__CLING__) )
/// @brief Cached NeutralPerigee, built from this object.
/// @note This is only available in Athena.
CxxUtils::CachedValue<Trk::NeutralPerigee> m_perigeeParameters;
-#endif // not XAOD_STANDALONE and not __CLING__
+#endif // not XAOD_ANALYSIS and not __CLING__
}; // class NeutralParticle_v1
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
index b2b0a0c24c0b9afc481437347226aa5aa1b5ebe6..c4bbcf0f915e40f101d7fba6163156ac47e8dcbd 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
@@ -20,13 +20,13 @@ extern "C" {
// xAOD include(s):
#include "xAODBase/IParticle.h"
-#include "xAODTracking/TrackingPrimitives.h"
+#include "xAODTracking/TrackingPrimitives.h"
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
// Athena includes
#include "TrkParameters/TrackParameters.h"
#include "TrkTrack/TrackCollection.h"
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
// ROOT include(s):
#include "Math/Vector4D.h"
@@ -52,7 +52,7 @@ namespace xAOD {
TrackParticle_v1(const TrackParticle_v1& o );
/// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
TrackParticle_v1& operator=(const TrackParticle_v1& tp );
-
+
/// @name IParticle functions
/// @{
/// The transverse momentum (\f$p_T\f$) of the particle.
@@ -105,7 +105,7 @@ namespace xAOD {
float theta() const;
/// Returns the \f$q/p\f$ parameter
float qOverP() const;
- /// @brief Returns a SVector of the Perigee track parameters.
+ /// @brief Returns a SVector of the Perigee track parameters.
/// i.e. a vector of
/// \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\q/p\end{array}\right)\f$
DefiningParameters_t definingParameters() const;
@@ -120,7 +120,7 @@ namespace xAOD {
/// Returns the length 6 vector containing the elements of defining parameters covariance matrix.
std::vector<float> definingParametersCovMatrixVec() const;
bool definingParametersCovMatrixOffDiagCompr() const ;
- /// Set the defining parameters.
+ /// Set the defining parameters.
void setDefiningParameters(float d0, float z0, float phi0, float theta, float qOverP);
/// Set the defining parameters covariance matrix.
void setDefiningParametersCovMatrix(const ParametersCovMatrix_t& cov);
@@ -141,22 +141,22 @@ namespace xAOD {
/// Set the origin for the parameters.
void setParametersOrigin(float x, float y, float z);
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
/// @brief Returns the Trk::MeasuredPerigee track parameters.
///
/// These are defined as:
/// \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\q/p\\\end{array}\right)\f$
- /// @note This is only available in Athena.
+ /// @note This is only available in Athena.
const Trk::Perigee& perigeeParameters() const;
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
/// @}
/// @name Curvilinear functions
/// The set of functions which return other track parameters.
- /// The remaining track parameters (i.e. not the 'defining parameters') use the 'curvilinear' coordinate system,
+ /// The remaining track parameters (i.e. not the 'defining parameters') use the 'curvilinear' coordinate system,
/// and are represented by the parameters @f$(x,y,z,p_x,p_y,p_z)@f$.
/// The parameters can have an associated local 5x5 error/covariance matrix. They are expressed at various points through the
- /// detector, which can be determined by the parameterPosition() method.
+ /// detector, which can be determined by the parameterPosition() method.
/// @code
/// // Example code to use parameters
/// unsigned int index=0;
@@ -165,8 +165,8 @@ namespace xAOD {
/// }
/// @endcode
/// @{
- /// Returns the number of additional parameters stored in the TrackParticle.
- size_t numberOfParameters() const;
+ /// Returns the number of additional parameters stored in the TrackParticle.
+ size_t numberOfParameters() const;
/// Returns the track parameter vector at 'index'.
const CurvilinearParameters_t trackParameters(unsigned int index) const;
/// Returns the parameter x position, for 'index'.
@@ -180,17 +180,17 @@ namespace xAOD {
/// Returns the parameter y momentum component, for 'index'.
float parameterPY(unsigned int index) const;
/// Returns the parameter z momentum component, for 'index'.
- float parameterPZ(unsigned int index) const;
- /// Set the parameters via the passed vector of vectors.
+ float parameterPZ(unsigned int index) const;
+ /// Set the parameters via the passed vector of vectors.
/// The vector<float> should be of size 6: x,y,z,px,py,pz (charge is stored elsewhere)
void setTrackParameters(std::vector<std::vector<float> >& parameters);
- /// @brief Returns the TrackParticleCovMatrix_t (covariance matrix) at 'index',
+ /// @brief Returns the TrackParticleCovMatrix_t (covariance matrix) at 'index',
/// which corresponds to the parameters at the same index.
ParametersCovMatrix_t trackParameterCovarianceMatrix(unsigned int index) const;
/// Set the cov matrix of the parameter at 'index', using a vector of floats.
- /// The vector @f$\mathrm{v}(a1,a2,a3 ... a_{15})@f$ represents the lower diagonal, i.e. it gives a matrix of
+ /// The vector @f$\mathrm{v}(a1,a2,a3 ... a_{15})@f$ represents the lower diagonal, i.e. it gives a matrix of
/// \f$\left(\begin{array}{ccccc} a_1 & a_2 & a_4 & a_7 & a_{11} \\ a_2 & a_3 & a_5 & a_8 & a_{12} \\ a_4 & a_5 & a_6 & a_9 & a_{13} \\ a_7 & a_8 & a_9 & a_{10} & a_{14} \\ a_{11} & a_{12} & a_{13} & a_{14} & a_{15} \end{array}\right)\f$
- void setTrackParameterCovarianceMatrix(unsigned int index, std::vector<float>& cov);
+ void setTrackParameterCovarianceMatrix(unsigned int index, std::vector<float>& cov);
/// @brief Return the ParameterPosition of the parameters at 'index'.
xAOD::ParameterPosition parameterPosition(unsigned int index) const;
/// @brief Function to determine if this TrackParticle contains track parameters at a certain position, and if so, what the 'index' is.
@@ -198,30 +198,30 @@ namespace xAOD {
/// @param[out] position The location in the detector of the required track parameters.
/// @return Returns 'true' if the TrackParticle parameters at 'position', returns False otherwise.
bool indexOfParameterAtPosition(unsigned int& index, ParameterPosition position) const;
- /// Set the 'position' (i.e. where it is in ATLAS) of the parameter at 'index', using the ParameterPosition enum.
+ /// Set the 'position' (i.e. where it is in ATLAS) of the parameter at 'index', using the ParameterPosition enum.
void setParameterPosition(unsigned int index, ParameterPosition pos);
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
/// @brief Returns a curvilinear representation of the parameters at 'index'.
- /// @note This is only available in Athena.
- const Trk::CurvilinearParameters curvilinearParameters(unsigned int index) const;
-#endif // not XAOD_STANDALONE
+ /// @note This is only available in Athena.
+ const Trk::CurvilinearParameters curvilinearParameters(unsigned int index) const;
+#endif // not XAOD_ANALYSIS
/// Returns the radius of the first hit.
float radiusOfFirstHit() const;
/// Set the radius of the first hit.
void setRadiusOfFirstHit(float radius);
-
+
/// Returns the offline identifier of the first hit.
uint64_t identifierOfFirstHit() const;
/// Set the offline identifier of the first hit.
void setIdentifierOfFirstHit( uint64_t id);
-
+
float beamlineTiltX() const;
void setBeamlineTiltX(float tiltX);
-
+
float beamlineTiltY() const;
void setBeamlineTiltY(float tiltY);
-
+
uint32_t hitPattern() const;
void setHitPattern(uint32_t hitpattern);
@@ -239,26 +239,26 @@ namespace xAOD {
/// Returns the @f$ \chi^2 @f$ of the overall track fit.
float chiSquared() const;
/// Returns the number of degrees of freedom of the overall track or vertex fit as float.
- float numberDoF() const;
+ float numberDoF() const;
/// Set the 'Fit Quality' information.
- void setFitQuality(float chiSquared, float numberDoF);
+ void setFitQuality(float chiSquared, float numberDoF);
/// @}
/// @name TrackInfo functions
/// Contains information about the 'fitter' of this Trk::Track / TrackParticle.
- /// Additionally there is some information about how the e.g. fit was configured.
+ /// Additionally there is some information about how the e.g. fit was configured.
/// Also the information on the properties of the track fit is stored.
/// @{
/// Methods setting the TrackProperties.
void setTrackProperties (const TrackProperties properties) ;
- /// Method setting the pattern recognition algorithm, using a bitset.
+ /// Method setting the pattern recognition algorithm, using a bitset.
/// The bitset should be created using the TrackPatternRecoInfo enum as follows:
/// @code
/// const std::bitset<xAOD::NumberOfTrackRecoInfo> patternReco;
/// patternReco.set(xAOD::Fatras);
/// @endcode
void setPatternRecognitionInfo(const std::bitset<xAOD::NumberOfTrackRecoInfo>& patternReco) ;
- /// Method setting the pattern recognition algorithm, using a 64-bit int (which is faster than using a bitset).
+ /// Method setting the pattern recognition algorithm, using a 64-bit int (which is faster than using a bitset).
/// The bit set should be created using the TrackPatternRecoInfo enum as follows:
/// @code
/// uint64_t patternReco;
@@ -269,10 +269,10 @@ namespace xAOD {
void setTrackFitter(const TrackFitter fitter) ;
/// Method for setting the particle type, using the ParticleHypothesis enum.
void setParticleHypothesis(const ParticleHypothesis hypo);
- ///Access methods for track properties, which returns 'true'
+ ///Access methods for track properties, which returns 'true'
/// if a logical AND of the parameter 'proprty' and the stored properties returns true.
- /// i.e. you do:
- /// @code
+ /// i.e. you do:
+ /// @code
/// TrackProperties testProperty;
/// testProperty.set(SOMEPROPERTY);
/// if (trackParticle.trackProperties(testProperty)) doSomething();
@@ -289,17 +289,17 @@ namespace xAOD {
/// Accessor for TrackSummary values.
- /// If 'information' is stored in this TrackParticle and is of the correct templated type T,
- /// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
+ /// If 'information' is stored in this TrackParticle and is of the correct templated type T,
+ /// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
/// See below for an example of how this is intended to be used.
/// @code
/// int numberOfBLayerHits=0;
/// if( myParticle.summaryValue(numberOfBLayerHits,xAOD::numberOfBLayerHits) ){
- /// ATH_MSG_INFO("Successfully retrieved the integer value, numberOfBLayerHits");
+ /// ATH_MSG_INFO("Successfully retrieved the integer value, numberOfBLayerHits");
/// }
/// float numberOfCscPhiHits=0.0; //Wrong! This is actually an int too.
/// if( !myParticle.summaryValue(numberOfCscPhiHits,xAOD::numberOfCscPhiHits) ){
- /// ATH_MSG_INFO("Types must match!");
+ /// ATH_MSG_INFO("Types must match!");
/// }
/// @endcode
/// @param[in] information The information being requested. This is not guaranteed to be stored in all TrackParticles.
@@ -313,26 +313,26 @@ namespace xAOD {
/// @copydoc TrackParticle_v1::setSummaryValue(uint8_t& value, const SummaryType &information)
void setSummaryValue(float& value, const SummaryType &information);
/// @}
-
+
/// @name Links
/// @{
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
/// @brief Returns a link (which can be invalid) to the Trk::Track which was used to make this TrackParticle.
- /// @note This is only available in Athena.
+ /// @note This is only available in Athena.
const ElementLink< TrackCollection >& trackLink() const;
/// @brief Set the link to the original track
/// @note This is only available in Athena.
void setTrackLink(const ElementLink< TrackCollection >& track);
/// @brief Returns a pointer (which can be NULL) to the Trk::Track which was used to make this TrackParticle.
- /// @note This is only available in Athena.
- const Trk::Track* track() const;
-#endif // not XAOD_STANDALONE
+ /// @note This is only available in Athena.
+ const Trk::Track* track() const;
+#endif // not XAOD_ANALYSIS
/// @}
/// Reset the internal cache of the object
void resetCache();
-
+
private:
enum covMatrixIndex{d0_index=0, z0_index=1, phi_index=2, th_index=3, qp_index=4};
@@ -340,11 +340,11 @@ private:
static const std::size_t COVMATRIX_OFFDIAG_VEC_COMPR_SIZE = 6;
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(__CLING__) )
+#if ( ! defined(XAOD_ANALYSIS) ) && ( ! defined(__CLING__) )
/// @brief Cached MeasuredPerigee, built from this object.
/// @note This is only available in Athena.
CxxUtils::CachedValue<Trk::Perigee> m_perigeeParameters;
-#endif // not XAOD_STANDALONE and not __CLING__
+#endif // not XAOD_ANALYSIS and not __CLING__
}; // class Track Particle
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
index ee71bebc05ff37e4db2fec7f3cc0288bc72dd527..8d0c8ab17e816f1e5b25e91fa46d6f63b1ce4ef2 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODTRACKING_VERSIONS_VERTEX_V1_H
@@ -17,11 +17,9 @@
// EDM include(s):
#include "EventPrimitives/EventPrimitives.h"
#include "GeoPrimitives/GeoPrimitives.h"
-#ifndef XAOD_STANDALONE
-#ifndef XAOD_MANACORE
+#ifndef XAOD_ANALYSIS
# include "VxVertex/VxTrackAtVertex.h"
-#endif // not XAOD_MANACORE
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
// xAOD include(s):
#include "xAODTracking/TrackingPrimitives.h"
@@ -90,7 +88,7 @@ namespace xAOD {
/// Returns the @f$ \chi^2 @f$ of the vertex fit as float.
float chiSquared() const;
/// Returns the number of degrees of freedom of the vertex fit as float.
- float numberDoF() const;
+ float numberDoF() const;
/// Set the 'Fit Quality' information.
void setFitQuality( float chiSquared, float numberDoF );
@@ -101,14 +99,14 @@ namespace xAOD {
/// Set the type of the vertex
void setVertexType( VxType::VertexType vType );
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
+#ifndef XAOD_ANALYSIS
/// Non-const access to the VxTrackAtVertex vector
std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex();
/// Const access to the vector of tracks fitted to the vertex (may not exist!)
const std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex() const;
/// Check if VxTrackAtVertices are attached to the object
bool vxTrackAtVertexAvailable() const;
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+#endif // not XAOD_ANALYSIS
/// @name Track particle contents operations
/// @{
diff --git a/Event/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h b/Event/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h
index 78f6ff384d6fdbf02003d1ed6a44c7095c6c426c..4d8baa0f69c19b00a1b8f46677db9f53da0d6ef8 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h
@@ -4,7 +4,7 @@
*/
#ifndef XAODTRACKING_XAODTRACKINGDICT_H
#define XAODTRACKING_XAODTRACKINGDICT_H
-
+
// Local include(s).
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
@@ -74,9 +74,9 @@ namespace {
SCTRawHitValidationContainer_v1 );
// Type(s) needed for the dictionary generation to succeed.
-#ifndef XAOD_STANDALONE
+#ifndef XAOD_ANALYSIS
XAOD_INSTANTIATE_CONTAINER_TYPES( TrackCollection );
-#endif // not XAOD_STANDALONE
+#endif // not XAOD_ANALYSIS
xAOD::CurvilinearParameters_t dummy;
};
}