diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
index 398acd37470b040aea9635e194eec9a3e1b25992..81bd2e175ef7d8cfaf21d08705961734dd046d3e 100644
--- a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
@@ -7,8 +7,6 @@
and fit quality.
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
-
#include <cmath>
#include <iomanip>
#include "GaudiKernel/SystemOfUnits.h"
@@ -38,8 +36,6 @@
namespace Trk
{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
MaterialAllocator::MaterialAllocator (const std::string& type,
const std::string& name,
const IInterface* parent)
@@ -91,8 +87,6 @@ MaterialAllocator::MaterialAllocator (const std::string& type,
MaterialAllocator::~MaterialAllocator (void)
{}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
-
StatusCode
MaterialAllocator::initialize()
{
@@ -1135,8 +1129,6 @@ MaterialAllocator::reallocateMaterial (std::vector<FitMeasurement*>& measurement
return true;
}
-//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
MaterialAllocator::addSpectrometerDelimiters (std::vector<FitMeasurement*>& measurements) const
{
@@ -2305,12 +2297,6 @@ MaterialAllocator::materialAggregation (std::vector<FitMeasurement*>& measuremen
if ((**m).materialEffects()
&& (**m).numberDoF()
&& (**m).energyLoss() < 0.) energyGain = true;
-
-// if (! (**m).isMaterialDelimiter()) continue;
-// delete *m;
-// std::vector<Trk::FitMeasurement*>::iterator n = m;
-// --m;
-// measurements.erase(n);
}
if (energyGain)
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/iPatFitter.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/iPatFitter.cxx
index 85fbeb33a1ba4d3bc70caa931cc3b90e083dddc0..bf7fa51d931d9ed7e2804e43f50fbf88edc31448 100755
--- a/Tracking/TrkFitter/TrkiPatFitter/src/iPatFitter.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/iPatFitter.cxx
@@ -7,8 +7,6 @@
and fit quality.
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
-
#include <cmath>
#include <iomanip>
#include "EventPrimitives/EventPrimitives.h"
@@ -48,8 +46,6 @@
namespace Trk
{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
iPatFitter::iPatFitter (const std::string& type,
const std::string& name,
const IInterface* parent)
@@ -122,8 +118,6 @@ iPatFitter::iPatFitter (const std::string& type,
iPatFitter::~iPatFitter (void)
{}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
-
StatusCode
iPatFitter::initialize()
{
@@ -639,8 +633,6 @@ iPatFitter::fit (const Track& indetTrack,
}
}
-//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
iPatFitter::addMeasurements (std::vector<FitMeasurement*>& measurements,
const MeasurementSet& measurementSet,
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/iPatGlobalFitter.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/iPatGlobalFitter.cxx
index 3c10e3ad2c39b62fcf86d6814e0c1a91cc927e32..ece214fac7f5330f467991ebf0f3c3a19a9d1838 100755
--- a/Tracking/TrkFitter/TrkiPatFitter/src/iPatGlobalFitter.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/iPatGlobalFitter.cxx
@@ -9,7 +9,6 @@
// (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
-//<<<<<< INCLUDES >>>>>>
#include "GaudiKernel/SystemOfUnits.h"
#include "TrkiPatFitterUtils/ExtrapolationType.h"
@@ -21,8 +20,6 @@
namespace Trk
{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
iPatGlobalFitter::iPatGlobalFitter (const std::string& type,
const std::string& name,
const IInterface* parent)
@@ -40,8 +37,6 @@ iPatGlobalFitter::~iPatGlobalFitter (void)
delete m_derivativeMatrix;
}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
-
Amg::MatrixX*
iPatGlobalFitter::DerivMatrix() const
{
@@ -118,7 +113,6 @@ int
iPatGlobalFitter::iterationsOfLastFit() const
{ return m_iterations; }
-//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS >>>>>>
void
iPatGlobalFitter::setMinIterations(int minIterations)
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMatrices.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMatrices.cxx
index a79d4c958d3c37f82bc91074c51f6b0af3d50d80..c853149e874bce52db5f7aac3e531b04b18a625a 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMatrices.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMatrices.cxx
@@ -23,8 +23,6 @@
// (c) ATLAS tracking software
//////////////////////////////////////////////////////////////////////////////
-//<<<<<< INCLUDES >>>>>>
-
#include <iomanip>
#include <iostream>
#include "GaudiKernel/MsgStream.h"
@@ -36,8 +34,6 @@
#include "TrkiPatFitterUtils/FitMeasurement.h"
#include "TrkiPatFitterUtils/FitParameters.h"
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
namespace Trk{
FitMatrices::FitMatrices(bool constrainedAlignmentEffects, bool eigenMatrixTreatment)
@@ -74,8 +70,6 @@ FitMatrices::~FitMatrices(void)
delete m_weightedDifference;
}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
FitMatrices::checkPointers (MsgStream& log) const
{
@@ -747,7 +741,6 @@ FitMatrices::usePerigee (const FitMeasurement& measurement)
}
-//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS >>>>>>
void
FitMatrices::addPerigeeMeasurement (void)
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMeasurement.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMeasurement.cxx
index 09268e3008ea4110674ea3680a03d0440b956ae0..a005b63d24d5a70017d63a31a8437b646469fe13 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMeasurement.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitMeasurement.cxx
@@ -8,8 +8,6 @@
i.e. position, surface, weights, intersection, derivatives, residual etc
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
-
#include <cmath>
#include <iomanip>
#include <iostream>
@@ -38,8 +36,6 @@
namespace Trk{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
// MeasurementBase
FitMeasurement::FitMeasurement (int hitIndex,
HitOnTrack* hitOnTrack,
@@ -1017,8 +1013,6 @@ FitMeasurement::~FitMeasurement (void)
if (m_materialEffects && m_materialEffectsOwner) delete m_materialEffects;
}
-//<<<<<< MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
FitMeasurement::intersection (ExtrapolationType type,
const TrackSurfaceIntersection* value)
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitParameters.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitParameters.cxx
index 6a665ddb4375e3aec1963be8a9cec92aecf1c754..b2567c1480043ab7220a4471bf1af21dda21090a 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitParameters.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitParameters.cxx
@@ -6,8 +6,6 @@
local parameter values used during fitter
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
-
#include <cmath>
#include <iomanip>
#include <iostream>
@@ -24,8 +22,6 @@
namespace Trk{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
FitParameters::FitParameters (const Perigee& perigee)
: m_cosPhi1 (0.),
m_cosTheta1 (0.),
@@ -173,8 +169,6 @@ FitParameters::~FitParameters (void)
delete m_differencesMA27;
}
-//<<<<<< MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
FitParameters::addAlignment (bool constrained, double angle, double offset)
{
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedure.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedure.cxx
index de7017d1df334e711b63f0d86bc8d0a306cd483d..f8dd85d0eadcc5bc87774b8a6a8d7765004b5258 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedure.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedure.cxx
@@ -43,9 +43,6 @@
namespace Trk{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
-
// constructor
FitProcedure::FitProcedure (bool constrainedAlignmentEffects,
bool extendedDebug,
@@ -107,8 +104,6 @@ FitProcedure::~FitProcedure (void)
delete m_fitQuality;
}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
FitProcedure::clear (void)
{
@@ -792,8 +787,6 @@ FitProcedure::setMinIterations (int minIter)
if (m_minIter > m_maxIter) m_maxIter = m_minIter;
}
-//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS >>>>>>
-
void
FitProcedure::calculateChiSq(std::vector<FitMeasurement*>& measurements)
{
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedureQuality.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedureQuality.cxx
index b57b4d10e65d7aabdea11995beb302a757fd1bd3..62446159f915d4db016e057cb078acfce7caa1da 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedureQuality.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/FitProcedureQuality.cxx
@@ -6,15 +6,11 @@
quality variables produced during fit procedure
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
-
#include <iostream>
#include <iomanip>
#include "GaudiKernel/MsgStream.h"
#include "TrkiPatFitterUtils/FitProcedureQuality.h"
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
namespace Trk{
void
diff --git a/Tracking/TrkFitter/TrkiPatFitterUtils/src/MeasurementProcessor.cxx b/Tracking/TrkFitter/TrkiPatFitterUtils/src/MeasurementProcessor.cxx
index efd188738321e9cf80918575eb81e06bf5550bb4..bd48e5140849b7f68d42145d695376d2921701ff 100755
--- a/Tracking/TrkFitter/TrkiPatFitterUtils/src/MeasurementProcessor.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitterUtils/src/MeasurementProcessor.cxx
@@ -23,9 +23,6 @@
namespace Trk{
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-
-
// constructor
MeasurementProcessor::MeasurementProcessor (bool asymmetricCaloEnergy,
Amg::MatrixX& /*derivativeMatrix*/,
@@ -124,8 +121,6 @@ MeasurementProcessor::~MeasurementProcessor (void)
delete m_vertexIntersect;
}
-//<<<<<< MEMBER PUBLIC FUNCTION DEFINITIONS >>>>>>
-
bool
MeasurementProcessor::calculateDerivatives(void)
{
@@ -670,8 +665,6 @@ MeasurementProcessor::propagationDerivatives(void)
}
}
-//<<<<<< MEMBER PRIVATE FUNCTION DEFINITIONS >>>>>>
-
void
MeasurementProcessor::clusterDerivatives(int derivativeFlag, const FitMeasurement& measurement)
{