Skip to content
Snippets Groups Projects
Commit 091a16f7 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'unique_ptr_for_ForwardTrajectory' into 'master' 

ForwardGsfFitter: Trying to clean up a bit the ptr usage in the

See merge request !28849
parents 56035350 a5f7641a
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28849ForwardGsfFitter: Trying to clean up a bit the ptr usage in the
Hide whitespace changes
Inline Side-by-side
Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
+ 5
− 8
View file @ 091a16f7
......@@ -59,13 +59,13 @@ public:
const ToolHandle<Trk::IRIO_OnTrackCreator>&) override final;
/** Forward GSF fit using PrepRawData */
virtual const ForwardTrajectory* fitPRD(
virtual std::unique_ptr<ForwardTrajectory> fitPRD(
const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const override final;
/** Forward GSF fit using MeasurementSet */
virtual const ForwardTrajectory* fitMeasurements(
virtual std::unique_ptr<ForwardTrajectory> fitMeasurements(
const MeasurementSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const override final;
......@@ -79,7 +79,7 @@ private:
const PrepRawData*,
const MeasurementBase*,
const Surface&,
const MultiComponentState*&,
std::unique_ptr<MultiComponentState>&,
const ParticleHypothesis particleHypothesis = nonInteracting) const;
private:
......@@ -87,18 +87,15 @@ private:
ToolHandle<IMultiStateExtrapolator> m_extrapolator;
ToolHandle<IMultiStateMeasurementUpdator> m_updator;
ToolHandle<IRIO_OnTrackCreator> m_rioOnTrackCreator;
/** MultiComponentStateCombiner tool
*/
/** MultiComponentStateCombiner tool*/
ToolHandle<IMultiComponentStateCombiner> m_stateCombiner{ this,
"MultiComponentStateCombiner",
"Trk::MultiComponentStateCombiner/ForwardsFitterCombiner",
"" };
double m_cutChiSquaredPerNumberDOF;
bool m_overideMaterialEffectsSwitch;
int m_overideMaterialEffects;
ParticleHypothesis m_overideParticleHypothesis;
bool m_overideMaterialEffectsSwitch;
};
} // end Trk namespace
......
Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
+ 8
− 7
View file @ 091a16f7
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/* *******************************************************************************
IForwardGsfFitter.h - description
----------------------------------
created : Thursday 8th January 2009
author : amorley
authors : amorley,christos
email : Anthony.Morley@cern.ch
decription : Abstract interface for the forward GSF fitter
********************************************************************************** */
......@@ -18,10 +18,10 @@ decription : Abstract interface for the forward GSF fitter
#include "TrkFitterUtils/FitterTypes.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
#include "TrkParameters/TrackParameters.h"
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include <memory>
namespace Trk {
class IMultiStateMeasurementUpdator;
......@@ -51,12 +51,13 @@ public:
const ToolHandle<Trk::IRIO_OnTrackCreator>&) = 0;
/** Forward GSF fit using PrepRawData */
virtual const ForwardTrajectory* fitPRD(const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const = 0;
virtual std::unique_ptr<ForwardTrajectory> fitPRD(
const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const = 0;
/** Forward GSF fit using MeasurementSet */
virtual const ForwardTrajectory* fitMeasurements(
virtual std::unique_ptr<ForwardTrajectory> fitMeasurements(
const MeasurementSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const = 0;
......
Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
+ 36
− 92
View file @ 091a16f7
......@@ -29,13 +29,12 @@ decription : Implementation code for ForwardGsfFitter class
Trk::ForwardGsfFitter::ForwardGsfFitter(const std::string& type, const std::string& name, const IInterface* parent)
: AthAlgTool(type, name, parent)
, m_cutChiSquaredPerNumberDOF(50.)
, m_overideMaterialEffectsSwitch(false)
, m_overideMaterialEffects(4)
, m_overideParticleHypothesis(nonInteracting)
, m_overideMaterialEffectsSwitch(false)
{
declareInterface<IForwardGsfFitter>(this);
declareProperty("StateChi2PerNDOFCut", m_cutChiSquaredPerNumberDOF);
declareProperty("OverideForwardsMaterialEffects", m_overideMaterialEffectsSwitch);
declareProperty("MaterialEffectsInForwardFitter", m_overideMaterialEffects);
......@@ -73,22 +72,19 @@ Trk::ForwardGsfFitter::configureTools(const ToolHandle<IMultiStateExtrapolator>&
const ToolHandle<IMultiStateMeasurementUpdator>& measurementUpdator,
const ToolHandle<IRIO_OnTrackCreator>& rioOnTrackCreator)
{
m_extrapolator = extrapolator;
m_updator = measurementUpdator;
m_rioOnTrackCreator = rioOnTrackCreator;
ATH_MSG_INFO("Configuration of " << name() << " was successful");
return StatusCode::SUCCESS;
}
/*====================================================================================================================
/*==============================================================================================================
Forwards fit on a set of PrepRawData
===================================================================================================================
*/
=============================================================================================================*/
const Trk::ForwardTrajectory*
std::unique_ptr<Trk::ForwardTrajectory>
Trk::ForwardGsfFitter::fitPRD(const Trk::PrepRawDataSet& inputPrepRawDataSet,
const Trk::TrackParameters& estimatedTrackParametersNearOrigin,
const Trk::ParticleHypothesis particleHypothesis) const
......@@ -141,15 +137,16 @@ Trk::ForwardGsfFitter::fitPRD(const Trk::PrepRawDataSet& inputPrepRawDataSet,
}
// Create new trajectory
Trk::ForwardTrajectory* forwardTrajectory = new ForwardTrajectory();
auto forwardTrajectory = std::make_unique<Trk::ForwardTrajectory>();
// Prepare the multi-component state. For starting guess this has single component, weight 1
const AmgVector(5)& par = estimatedTrackParametersNearOrigin.parameters();
Trk::ComponentParameters componentParametersNearOrigin(
estimatedTrackParametersNearOrigin.associatedSurface().createTrackParameters(
par[Trk::loc1], par[Trk::loc2], par[Trk::phi], par[Trk::theta], par[Trk::qOverP], 0 /*no errors*/),1.);
const Trk::MultiComponentState* multiComponentStateNearOrigin =
new Trk::MultiComponentState(componentParametersNearOrigin);
auto multiComponentStateNearOrigin = std::make_unique<Trk::MultiComponentState>(componentParametersNearOrigin);
// Loop over all PrepRawData measurements
prepRawData = prepRawDataSet.begin();
......@@ -157,31 +154,27 @@ Trk::ForwardGsfFitter::fitPRD(const Trk::PrepRawDataSet& inputPrepRawDataSet,
for (; prepRawData != prepRawDataSet.end(); ++prepRawData) {
// Every valid step the ForwardTrajectory object passed to the stepForwardFit method is updated
bool stepIsValid = stepForwardFit(forwardTrajectory,
bool stepIsValid = stepForwardFit(forwardTrajectory.get(),
*prepRawData,
0,
nullptr,
(*prepRawData)->detectorElement()->surface((*prepRawData)->identify()),
multiComponentStateNearOrigin,
configuredParticleHypothesis);
if (!stepIsValid) {
ATH_MSG_DEBUG("Fitter step is not valid... Exiting!");
delete forwardTrajectory;
return 0;
return nullptr;
}
}
delete multiComponentStateNearOrigin;
return forwardTrajectory;
}
/* =================================================================================================================
/* ================================================================================================
Forwards fit on a set of Measurements
===================================================================================================================
================================================================================================
*/
const Trk::ForwardTrajectory*
std::unique_ptr<Trk::ForwardTrajectory>
Trk::ForwardGsfFitter::fitMeasurements(const Trk::MeasurementSet& inputMeasurementSet,
const Trk::TrackParameters& estimatedTrackParametersNearOrigin,
const Trk::ParticleHypothesis particleHypothesis) const
......@@ -189,17 +182,17 @@ Trk::ForwardGsfFitter::fitMeasurements(const Trk::MeasurementSet& inputMeasureme
// Check that the updator is instansiated
if (!m_updator) {
ATH_MSG_ERROR("The measurement updator is not configured... Exiting!");
return 0;
return nullptr;
}
if (!m_extrapolator) {
ATH_MSG_ERROR("The extrapolator is not configured... Exiting!");
return 0;
return nullptr;
}
if (inputMeasurementSet.empty()) {
ATH_MSG_ERROR("Input MeasurementSet is empty... Exiting!");
return 0;
return nullptr;
}
// Configure for forwards filtering material effects overide
......@@ -213,7 +206,7 @@ Trk::ForwardGsfFitter::fitMeasurements(const Trk::MeasurementSet& inputMeasureme
}
// This memory should be freed by the fitter / smoother master method
Trk::ForwardTrajectory* forwardTrajectory = new ForwardTrajectory();
auto forwardTrajectory = std::make_unique<Trk::ForwardTrajectory>();
// Prepare the multi-component state. For starting guess this has single component, weight 1
const AmgVector(5)& par = estimatedTrackParametersNearOrigin.parameters();
......@@ -224,37 +217,30 @@ Trk::ForwardGsfFitter::fitMeasurements(const Trk::MeasurementSet& inputMeasureme
estimatedTrackParametersNearOrigin.associatedSurface().createTrackParameters(
par[Trk::loc1], par[Trk::loc2], par[Trk::phi], par[Trk::theta], par[Trk::qOverP], covariance /*no errors*/),1.);
const Trk::MultiComponentState* multiComponentStateNearOrigin =
new Trk::MultiComponentState(componentParametersNearOrigin);
auto multiComponentStateNearOrigin =std::make_unique<Trk::MultiComponentState>(componentParametersNearOrigin);
// Loop over all MeasurementBase objects in set
Trk::MeasurementSet::const_iterator measurement = inputMeasurementSet.begin();
for (; measurement != inputMeasurementSet.end(); ++measurement) {
bool stepIsValid = stepForwardFit(forwardTrajectory,
0,
bool stepIsValid = stepForwardFit(forwardTrajectory.get(),
nullptr,
*measurement,
(*measurement)->associatedSurface(),
multiComponentStateNearOrigin,
configuredParticleHypothesis);
if (!stepIsValid) {
ATH_MSG_DEBUG("Fitter step is not valid... Exiting!");
delete forwardTrajectory;
if (multiComponentStateNearOrigin){
delete multiComponentStateNearOrigin;
}
return 0;
return nullptr;
}
}
delete multiComponentStateNearOrigin;
return forwardTrajectory;
}
/* ===============================================================================================================
/* =====================================================================================
StepForwardFit() private method
==============================================================================================================
=====================================================================================
*/
bool
......@@ -262,95 +248,65 @@ Trk::ForwardGsfFitter::stepForwardFit(ForwardTrajectory* forwardTrajectory,
const Trk::PrepRawData* originalPrepRawData,
const Trk::MeasurementBase* originalMeasurement,
const Trk::Surface& surface,
const Trk::MultiComponentState*& updatedState,
std::unique_ptr<Trk::MultiComponentState>& updatedState,
const Trk::ParticleHypothesis particleHypothesis) const
{
// Protect against undefined Measurement or PrepRawData
if (!originalPrepRawData && !originalMeasurement) {
ATH_MSG_WARNING("No measurement information passed to StepForwardFit... Exiting!");
if (updatedState) {
delete updatedState;
updatedState = 0;
}
return false;
}
// Protect against ForwardTrajectory not defined
if (!forwardTrajectory) {
ATH_MSG_WARNING("ForwardTrajectory object is not defined... Exiting!");
if (updatedState) {
delete updatedState;
updatedState = 0;
}
return false;
}
// =================================================================
// Extrapolate multi-component state to the next measurement surface
// =================================================================
const Trk::MultiComponentState* extrapolatedState =
m_extrapolator->extrapolate(*updatedState, surface, Trk::alongMomentum, false, particleHypothesis).release();
if (extrapolatedState && extrapolatedState != updatedState) {
delete updatedState;
updatedState = 0;
}
std::unique_ptr<Trk::MultiComponentState> extrapolatedState =
m_extrapolator->extrapolate(*updatedState, surface, Trk::alongMomentum, false, particleHypothesis);
if (!extrapolatedState) {
ATH_MSG_DEBUG( "Extrapolation failed... returning false");
delete updatedState;
updatedState = 0;
return false;
} else {
updatedState = 0;
}
// =======================
// Measurement Preparation
// =======================
std::unique_ptr<Trk::TrackParameters> combinedState = nullptr;
const Trk::MeasurementBase* measurement = 0;
std::unique_ptr<const Trk::MeasurementBase> measurement = nullptr;
if (originalMeasurement) {
// Clone original MeasurementBase object (refit with no new calibration)
measurement = originalMeasurement->clone();
measurement.reset(originalMeasurement->clone());
}
else {
combinedState = m_stateCombiner->combine(*extrapolatedState);
if (!combinedState) {
ATH_MSG_WARNING("State combination failed... exiting");
delete extrapolatedState;
return false;
}
// Create a new MeasurementBase object from PrepRawData using new calibration
measurement = m_rioOnTrackCreator->correct(*originalPrepRawData, *combinedState);
measurement.reset(m_rioOnTrackCreator->correct(*originalPrepRawData, *combinedState));
combinedState.reset();
}
// ==========================
// Perform measurement update
// ==========================
if (!measurement) {
ATH_MSG_WARNING("Cannot use MeasurementBase for measurement update, it is not defined... Exiting!");
delete extrapolatedState;
return false;
}
std::unique_ptr<Trk::FitQualityOnSurface> fitQuality;
updatedState = m_updator->update(*extrapolatedState, *measurement, fitQuality).release();
updatedState = m_updator->update(*extrapolatedState, *measurement, fitQuality);
if (!updatedState) {
delete measurement;
delete extrapolatedState;
ATH_MSG_DEBUG("Measurement update of the state failed... Exiting!");
return false;
}
// =====================
// =====================
// Determine fit quality
// =====================
......@@ -358,40 +314,28 @@ Trk::ForwardGsfFitter::stepForwardFit(ForwardTrajectory* forwardTrajectory,
if (!fitQuality) {
ATH_MSG_DEBUG("Failed to make fit quality... rejecting forwards trajectory");
// Clean up objects associated with removed measurement
delete measurement;
delete updatedState;
updatedState = 0;
delete extrapolatedState;
return false;
}
// Reject hits with excessive Chi2
else if (fitQuality->chiSquared() > m_cutChiSquaredPerNumberDOF * fitQuality->numberDoF()) {
ATH_MSG_DEBUG("Update with new measurement caused track to fail Chi Squared test, removing the object");
fitQuality = std::make_unique<FitQuality>(1, 1);
std::bitset<TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> type(0);
type.set(TrackStateOnSurface::Outlier);
const Trk::MultiComponentStateOnSurface* multiComponentStateOnSurface =
new MultiComponentStateOnSurface(measurement, extrapolatedState->clone(), fitQuality.release(), 0, type);
new MultiComponentStateOnSurface(measurement.release(), extrapolatedState->clone(),
fitQuality.release(), nullptr, type);
forwardTrajectory->push_back(multiComponentStateOnSurface);
// Clean up objects associated with removed measurement
// delete measurement;
// delete fitQuality;
delete updatedState;
updatedState = extrapolatedState;
// Reset extrapolated state pointer
extrapolatedState = 0;
updatedState =std::move(extrapolatedState);
} else {
const Trk::MultiComponentStateOnSurface* multiComponentStateOnSurface =
new MultiComponentStateOnSurface(measurement, extrapolatedState, fitQuality.release());
new MultiComponentStateOnSurface(measurement.release(), extrapolatedState.release(), fitQuality.release());
forwardTrajectory->push_back(multiComponentStateOnSurface);
}
......
Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+ 5
− 4
View file @ 091a16f7
......@@ -319,8 +319,8 @@ Trk::GaussianSumFitter::fit(const Trk::PrepRawDataSet& prepRawDataSet,
}
// Perform GSF forwards fit
const ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter->fitPRD(sortedPrepRawDataSet, estimatedParametersNearOrigin, particleHypothesis);
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter->fitPRD(sortedPrepRawDataSet, estimatedParametersNearOrigin, particleHypothesis).release();
if (!forwardTrajectory) {
ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
......@@ -467,8 +467,9 @@ Trk::GaussianSumFitter::fit(const Trk::MeasurementSet& measurementSet,
delete measurementBaseComparisonFunction;
}
// Perform GSF forwards fit - new memory allocated in forwards fitter
const ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter->fitMeasurements(sortedMeasurementSet, estimatedParametersNearOrigin, particleHypothesis);
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter->fitMeasurements(sortedMeasurementSet,
estimatedParametersNearOrigin, particleHypothesis).release();
if (!forwardTrajectory) {
ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
......
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