Commit cf330a7b authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'Clang warnings: unused members.' (TrkiPatFitterUtils-00-13-03)

        * Tagging TrkiPatFitterUtils-00-13-03.
	* Clang warnings: unused members.
        * Tagging TrkiPatFitterUtils-00-13-02.
	* endreq -> endmsg.


Former-commit-id: ff22c401
parent 13965cf0
......@@ -102,7 +102,7 @@ namespace Trk
int m_columns;
bool m_constrainedAlignmentEffects;
Amg::MatrixX* m_covariance;
bool m_fastMatrixTreatment;
//bool m_fastMatrixTreatment;
Amg::MatrixX* m_finalCovariance;
std::vector<int> m_firstRowForParameter;
double m_largePhiWeight;
......
......@@ -62,13 +62,13 @@ private:
double m_derivQOverP1;
double m_energyResidual;
int m_firstScatteringParameter;
bool m_havePhiPseudo;
//bool m_havePhiPseudo;
const TrackSurfaceIntersection* m_intersectStartingValue;
const ToolHandle<IIntersector>& m_intersector;
double m_largeDeltaD0;
double m_largeDeltaPhi0;
std::list<FitMeasurement*>& m_measurements;
double m_minDistanceForAngle;
//double m_minDistanceForAngle;
bool m_numericDerivatives;
FitParameters* m_parameters;
bool m_phiInstability;
......@@ -79,12 +79,12 @@ private:
std::vector<FitMeasurement*> m_scatterers;
double m_sinPhi0;
double m_sinTheta0;
double m_toroidTurn;
//double m_toroidTurn;
const TrackSurfaceIntersection* m_vertexIntersect;
double m_x0;
double m_y0;
double m_z0;
bool m_zInstability;
//bool m_zInstability;
};
} // end of namespace
......
......@@ -56,14 +56,14 @@ MessageHelper::printSummary (void) const
std::stringstream out;
out << " summary of WARNING occurences (maximum shown during job: " << m_maxWarnings << "):";
m_parent.msg(MSG::INFO) << out.str() << endreq;
m_parent.msg(MSG::INFO) << out.str() << endmsg;
for (unsigned int i = 0; i < m_warningCounts.size(); ++i)
{
if (! m_warningCounts[i]) continue;
out.str("");
out << " " << m_warningCounts[i] << ":\t" << m_warningText[i];
m_parent.msg(MSG::INFO) << out.str() << endreq;
m_parent.msg(MSG::INFO) << out.str() << endmsg;
}
}
......@@ -74,10 +74,10 @@ MessageHelper::printWarning (unsigned int messageNumber)
if (! m_parent.msgLvl(MSG::WARNING)
|| m_warningCounts[messageNumber] > m_maxWarnings) return;
m_parent.msg(MSG::WARNING) << m_warningText[messageNumber] << endreq;
m_parent.msg(MSG::WARNING) << m_warningText[messageNumber] << endmsg;
if (m_warningCounts[messageNumber] == m_maxWarnings)
m_parent.msg(MSG::WARNING) << "Limit reached. No more messages of this type will be printed."
<< endreq;
<< endmsg;
}
inline void
......@@ -87,10 +87,10 @@ MessageHelper::printWarning (unsigned int messageNumber, const std::string& addi
if (! m_parent.msgLvl(MSG::WARNING)
|| m_warningCounts[messageNumber] > m_maxWarnings) return;
m_parent.msg(MSG::WARNING) << m_warningText[messageNumber] << addition << endreq;
m_parent.msg(MSG::WARNING) << m_warningText[messageNumber] << addition << endmsg;
if (m_warningCounts[messageNumber] == m_maxWarnings)
m_parent.msg(MSG::WARNING) << "Limit reached. No more messages of this type will be printed."
<< endreq;
<< endmsg;
}
inline void
......
......@@ -39,11 +39,11 @@
namespace Trk{
FitMatrices::FitMatrices(bool constrainedAlignmentEffects, bool fastMatrixTreatment)
FitMatrices::FitMatrices(bool constrainedAlignmentEffects, bool /*fastMatrixTreatment*/)
: m_columns (mxparam), // reserve at maximum size
m_constrainedAlignmentEffects (constrainedAlignmentEffects),
m_covariance (0),
m_fastMatrixTreatment (fastMatrixTreatment),
//m_fastMatrixTreatment (fastMatrixTreatment),
m_finalCovariance (0),
m_largePhiWeight (10000.), // arbitrary - equiv to 10um
m_matrixFromCLHEP (false),
......
......@@ -631,14 +631,14 @@ FitParameters::trackParameters (MsgStream& log,
// 1) a Surface is required
if (! measurement.surface())
{
log << MSG::WARNING << "FitParameters::trackParameters - measurement lacks Surface" << endreq;
log << MSG::WARNING << "FitParameters::trackParameters - measurement lacks Surface" << endmsg;
return 0;
}
// 2) a SurfaceIntersection is required
if (! measurement.hasIntersection(FittedTrajectory))
{
log << MSG::WARNING << "FitParameters::trackParameters - invalid measurement" << endreq;
log << MSG::WARNING << "FitParameters::trackParameters - invalid measurement" << endmsg;
return 0;
}
......@@ -649,7 +649,7 @@ FitParameters::trackParameters (MsgStream& log,
intersection.direction(),
localPos))
{
log << MSG::WARNING << "FitParameters::trackParameters - globalToLocal failure" << endreq;
log << MSG::WARNING << "FitParameters::trackParameters - globalToLocal failure" << endmsg;
return 0;
}
......@@ -808,7 +808,7 @@ FitParameters::trackParameters (MsgStream& log,
return parameters;
}
log << MSG::WARNING << "FitParameters::trackParameters - unrecognized surface" << endreq;
log << MSG::WARNING << "FitParameters::trackParameters - unrecognized surface" << endmsg;
delete covMatrix;
return 0;
}
......
......@@ -178,7 +178,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
*m_log << MSG::DEBUG << " skip empty TSOS# " << tsos + 1;
if ((**m).materialEffects()) *m_log << " with material";
(**m).print(*m_log);
*m_log << endreq;
*m_log << endmsg;
}
}
else
......@@ -192,7 +192,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
{
*m_log << MSG::WARNING
<< " fail track with incomplete return TSOS: no trackParameters"
<< endreq;
<< endmsg;
delete trackStateOnSurfaces;
return 0;
}
......@@ -217,7 +217,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
else
{
fitMeasurement = *m;
if (m_verbose) *m_log << MSG::VERBOSE << " tsos# " << tsos << " shared surface" << endreq;
if (m_verbose) *m_log << MSG::VERBOSE << " tsos# " << tsos << " shared surface" << endmsg;
}
// it's a measurement
......@@ -236,7 +236,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
{
*m_log << MSG::WARNING
<< " fail track with incomplete return TSOS: no trackParameters"
<< endreq;
<< endmsg;
delete trackStateOnSurfaces;
return 0;
}
......@@ -327,7 +327,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
}
else
{
*m_log << MSG::WARNING <<" deprecated TrackStateOnSurface::InertMaterial" << endreq;
*m_log << MSG::WARNING <<" deprecated TrackStateOnSurface::InertMaterial" << endmsg;
materialEffects = (**m).materialEffects()->clone();
typePattern.set(TrackStateOnSurface::InertMaterial);
}
......@@ -345,7 +345,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
const AlignmentEffectsOnTrack& AEOT = *(**m).alignmentEffects();
unsigned align = (**m).alignmentParameter() - 1;
*m_log << MSG::VERBOSE <<" Fitprocedure AEOT input deltaTranslation " << AEOT.deltaTranslation() << " deltaAngle " << AEOT.deltaAngle() << " output Trans " << parameters.alignmentOffset(align) << " deltaAngle " << parameters.alignmentAngle(align) << endreq;
*m_log << MSG::VERBOSE <<" Fitprocedure AEOT input deltaTranslation " << AEOT.deltaTranslation() << " deltaAngle " << AEOT.deltaAngle() << " output Trans " << parameters.alignmentOffset(align) << " deltaAngle " << parameters.alignmentAngle(align) << endmsg;
alignmentEffects =
new Trk::AlignmentEffectsOnTrack(parameters.alignmentOffset(align),
AEOT.sigmaDeltaTranslation(),
......@@ -370,7 +370,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
{
*m_log << MSG::WARNING
<< " fail track with incomplete return TSOS: no trackParameters"
<< endreq;
<< endmsg;
delete trackStateOnSurfaces;
return 0;
}
......@@ -389,7 +389,7 @@ FitProcedure::constructTrack (const std::list<FitMeasurement*>& measurements,
trackStateOnSurfaces,
new FitQuality(chiSquared,m_numberDoF));
if (m_verbose) *m_log << MSG::VERBOSE << " track with " << tsos << " TSOS " << endreq;
if (m_verbose) *m_log << MSG::VERBOSE << " track with " << tsos << " TSOS " << endmsg;
return track;
}
......@@ -414,7 +414,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
if (m_log->level() < MSG::DEBUG) m_verbose = true;
*m_log << MSG::DEBUG << "parameter start values: ";
parameters->print(*m_log);
*m_log << endreq;
*m_log << endmsg;
}
// choose appropriate intersector
......@@ -471,7 +471,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
m_convergence = true;
m_cutStep = false;
if (m_verbose)
*m_log << MSG::VERBOSE << " convergence problem: accept after max iter " << endreq;
*m_log << MSG::VERBOSE << " convergence problem: accept after max iter " << endmsg;
}
else if (! m_cutStep)
{
......@@ -485,7 +485,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
&& ! parameters->extremeMomentum()
&& std::abs(parameters->qOverP()) < m_extremeOneOverP)
{
if (m_debug) *m_log << MSG::DEBUG << " extremeMomentum " << endreq;
if (m_debug) *m_log << MSG::DEBUG << " extremeMomentum " << endmsg;
parameters->extremeMomentum(true);
delete bestParameters;
fitCode = m_fitMatrices->setDimensions(measurements,parameters);
......@@ -563,7 +563,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
if (m_debug)
{
if (m_verbose) *m_log << endreq;
if (m_verbose) *m_log << endmsg;
reportQuality(measurements,*parameters);
}
return *m_fitQuality;
......@@ -600,7 +600,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
<< m_iteration
<< " chi2Ratio " << m_chRatio1
<< " driftSum " << m_driftSum << " prev " << m_driftSumLast
<< " " << cutStep << endreq;
<< " " << cutStep << endmsg;
}
else if (parameters->numberOscillations() > 2)
{
......@@ -610,7 +610,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
*m_log << MSG::VERBOSE
<< " take cutStep as oscillating, iteration "
<< m_iteration << ", numberOscillations "
<< parameters->numberOscillations() << endreq;
<< parameters->numberOscillations() << endmsg;
}
// perform cutstep
......@@ -627,7 +627,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
if (m_verbose) *m_log << " after cutStep: "
<< " chi2Ratio " << m_chRatio1
<< " driftSum " << m_driftSum
<< endreq;
<< endmsg;
}
}
}
......@@ -663,7 +663,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
if (forceIteration) m_convergence = false;
}
} // if (std::abs(ptInv0) > ptInvCut)
if (m_verbose) *m_log << endreq;
if (m_verbose) *m_log << endmsg;
// try to rescue phi instability failures
if (fitCode
......@@ -672,7 +672,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
&& ! parameters->phiInstability()
&& (**(measurements.rbegin())).position().perp() > m_largeRadius)
{
if (m_verbose) *m_log << MSG::VERBOSE << " phi instability " << endreq;
if (m_verbose) *m_log << MSG::VERBOSE << " phi instability " << endmsg;
parameters->reset(*bestParameters);
parameters->setPhiInstability();
m_cutStep = true;
......@@ -727,7 +727,7 @@ FitProcedure::execute(bool asymmetricCaloEnergy,
*m_log << MSG::VERBOSE << " fit converged";
if (m_chiSqWorst > 6.25) *m_log << " with possible outlier #" << m_worstMeasurement
<< " (residual " << std::sqrt(m_chiSqWorst) << ")";
*m_log << endreq;
*m_log << endmsg;
}
}
else
......@@ -946,7 +946,7 @@ FitProcedure::calculateChiSq(std::list<FitMeasurement*>& measurements)
else
{
m_nearConvergence = true;
if (m_verbose) *m_log << MSG::VERBOSE << " near convergence " << endreq;
if (m_verbose) *m_log << MSG::VERBOSE << " near convergence " << endmsg;
}
}
else
......@@ -1069,17 +1069,17 @@ FitProcedure::reportQuality(const std::list<FitMeasurement*>& measurements,
default:
break;
};
*m_log << std::endl << endreq;
*m_log << std::endl << endmsg;
}
else
{
*m_log << MSG::DEBUG << "fitted parameter values: ";
parameters.print(*m_log);
*m_log << endreq;
*m_log << endmsg;
*m_log << MSG::DEBUG;
m_fitQuality->print(*m_log);
parameters.printCovariance(*m_log);
*m_log << endreq;
*m_log << endmsg;
}
}
......
......@@ -39,12 +39,12 @@ MeasurementProcessor::MeasurementProcessor (bool asymmetricCaloEnergy,
m_derivQOverP1 (0.),
m_energyResidual (0.),
m_firstScatteringParameter (parameters->firstScatteringParameter()),
m_havePhiPseudo (false),
//m_havePhiPseudo (false),
m_intersector (intersector),
m_largeDeltaD0 (50.*Gaudi::Units::mm),
m_largeDeltaPhi0 (0.05),
m_measurements (measurements),
m_minDistanceForAngle (2.*Gaudi::Units::mm),
//m_minDistanceForAngle (2.*Gaudi::Units::mm),
m_numericDerivatives (false),
m_parameters (parameters),
m_phiInstability (false),
......@@ -53,12 +53,12 @@ MeasurementProcessor::MeasurementProcessor (bool asymmetricCaloEnergy,
m_rungeKuttaIntersector (rungeKuttaIntersector),
m_sinPhi0 (parameters->sinPhi()),
m_sinTheta0 (parameters->sinTheta()),
m_toroidTurn (0.1),
//m_toroidTurn (0.1),
m_vertexIntersect (0),
m_x0 (parameters->position().x()),
m_y0 (parameters->position().y()),
m_z0 (parameters->position().z()),
m_zInstability (false)
m_z0 (parameters->position().z())
//m_zInstability (false)
{
m_alignments.reserve(10);
m_intersectStartingValue = m_parameters->intersection();
......@@ -577,7 +577,7 @@ MeasurementProcessor::fieldIntegralUncertainty (MsgStream& log, Amg::MatrixX& co
<< " diff "
<< std::setw(8) << std::setprecision(4) << deltaPhi
<< std::setw(8) << std::setprecision(4) << deltaTheta
<< endreq;
<< endmsg;
return;
}
}
......@@ -630,7 +630,7 @@ MeasurementProcessor::fieldIntegralUncertainty (MsgStream& log, Amg::MatrixX& co
<< " diff "
<< std::setw(8) << std::setprecision(4) << deltaPhi
<< std::setw(8) << std::setprecision(4) << deltaTheta
<< endreq;
<< endmsg;
}
}
}
......
Markdown is supported
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