Skip to content
Snippets Groups Projects
Commit 016fcc18 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'adye-ckf51' into 'main' 

TrackStatePrinter methods templated on track container backend type

See merge request atlas/athena!70604
parents c748402f 80963476
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 211 additions and 228 deletions
Tracking/Acts/ActsTrackReconstruction/src/ITrackStatePrinter.h deleted 100644 → 0
+ 0
− 67
View file @ c748402f
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSTRKFINDINGTOOL_ITRACKSTATEPRINTER_H
#define ACTSTRKFINDINGTOOL_ITRACKSTATEPRINTER_H 1
// Base
#include "GaudiKernel/IAlgTool.h"
// ATHENA
#include "GeoPrimitives/GeoPrimitives.h"
#include "GaudiKernel/EventContext.h"
// ACTS CORE
#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/EventData/TrackParameters.hpp"
// PACKAGE
#include "ActsGeometry/ATLASSourceLink.h"
#include "ActsEvent/Seed.h"
#include "ActsEvent/TrackContainer.h"
// Other
#include <vector>
namespace InDetDD
{
class SiDetectorElementCollection;
}
namespace ActsTrk
{
class ITrackStatePrinter
: virtual public IAlgTool
{
public:
DeclareInterfaceID(ITrackStatePrinter, 1, 0);
virtual void
printMeasurements(const EventContext &ctx,
const std::vector<const xAOD::UncalibratedMeasurementContainer *> &clusterContainers,
const std::vector<const InDetDD::SiDetectorElementCollection *> &detectorElementCollections,
const std::vector<size_t> &offsets) const = 0;
virtual void
printSeed(const Acts::GeometryContext &tgContext,
const ActsTrk::Seed &seed,
const Acts::BoundTrackParameters &initialParameters,
size_t measurementOffset,
size_t iseed,
bool isKF) const = 0;
virtual void
printTrack(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackContainer &tracks,
const ActsTrk::MutableTrackContainer::TrackProxy &track,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &offset) const = 0;
virtual void
printTrackState(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackStateBackend::ConstTrackStateProxy &state,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset,
bool useFiltered = false) const = 0;
};
} // namespace
#endif
Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx
+ 1
− 1
View file @ 016fcc18
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include "src/TrackFindingAlg.h"
#include "src/TrackFindingData.h"
......
Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h
+ 3
− 3
View file @ 016fcc18
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSTRACKRECONSTRUCTION_TRACKFINDINGALG_H
......@@ -14,7 +14,7 @@
// Tools
#include "ActsGeometryInterfaces/IActsExtrapolationTool.h"
#include "ActsGeometryInterfaces/IActsTrackingGeometryTool.h"
#include "src/ITrackStatePrinter.h"
#include "src/TrackStatePrinter.h"
// ACTS
#include "ActsEvent/Seed.h"
......@@ -75,7 +75,7 @@ namespace ActsTrk
ToolHandle<IActsExtrapolationTool> m_extrapolationTool{this, "ExtrapolationTool", ""};
ToolHandle<IActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", ""};
ToolHandle<ActsTrk::IActsToTrkConverterTool> m_ATLASConverterTool{this, "ATLASConverterTool", ""};
ToolHandle<ActsTrk::ITrackStatePrinter> m_trackStatePrinter{this, "TrackStatePrinter", "", "optional track state printer"};
ToolHandle<ActsTrk::TrackStatePrinter> m_trackStatePrinter{this, "TrackStatePrinter", "", "optional track state printer"};
ToolHandle<ActsTrk::IFitterTool> m_fitterTool{this, "FitterTool", "", "Fitter Tool for Seeds"};
ToolHandle<ActsTrk::IOnTrackCalibratorTool<ActsTrk::MutableTrackStateBackend>> m_pixelCalibTool{
this, "PixelCalibrator", "", "Opt. pixel measurement calibrator"};
......
Tracking/Acts/ActsTrackReconstruction/src/TrackFindingData.h
+ 1
− 1
View file @ 016fcc18
......@@ -23,7 +23,7 @@
#include "ActsGeometry/ATLASSourceLink.h"
#include "ActsGeometry/TrackingSurfaceHelper.h"
#include "ActsEventCnv/IActsToTrkConverterTool.h"
#include "src/ITrackStatePrinter.h"
#include "src/TrackStatePrinter.h"
#include <unordered_map>
#include <utility>
......
Tracking/Acts/ActsTrackReconstruction/src/TrackStatePrinter.cxx
+ 14
− 144
View file @ 016fcc18
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include "src/TrackStatePrinter.h"
......@@ -7,6 +7,7 @@
// Athena
#include "TrkParameters/TrackParameters.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "xAODMeasurementBase/UncalibratedMeasurementContainer.h"
// ACTS
#include "Acts/Definitions/Units.hpp"
......@@ -18,34 +19,24 @@
#include "Acts/Surfaces/DiscSurface.hpp"
#include "Acts/EventData/TransformationHelpers.hpp"
#include "ActsEvent/TrackContainer.h"
// PACKAGE
#include "ActsGeometry/ActsDetectorElement.h"
#include "ActsEvent/TrackContainer.h"
#include "ActsInterop/Logger.h"
// Other
#include <vector>
#include <iostream>
#include <sstream>
namespace ActsTrk
{
/// =========================================================================
/// Debug printout routines
/// This is only required by code in this file, so we keep it in the anonymous namespace.
/// The actual TrackStatePrinter class definition comes later.
/// file-local static functions and static TrackStatePrinter member functions.
/// TrackStatePrinter class method definitions comes later.
/// =========================================================================
/// format all arguments and return as a string.
/// Used here to apply std::setw() to the combination of values.
template <typename... Types>
static std::string to_string(Types &&...values)
{
std::ostringstream os;
(os << ... << values);
return os.str();
}
static std::string trackStateName(Acts::ConstTrackStateType trackStateType)
std::string TrackStatePrinter::trackStateName(Acts::ConstTrackStateType trackStateType)
{
static constexpr std::array<std::tuple<bool, Acts::TrackStateFlag, char>, 6> trackStateNames{{
{false, Acts::TrackStateFlag::ParameterFlag, '-'},
......@@ -65,7 +56,7 @@ namespace ActsTrk
}
// compact surface/boundary name
static std::string actsSurfaceName(const Acts::Surface &surface)
std::string TrackStatePrinter::actsSurfaceName(const Acts::Surface &surface)
{
std::string name = surface.name();
if (name.compare(0, 6, "Acts::") == 0)
......@@ -394,7 +385,7 @@ namespace ActsTrk
std::cout << '\n';
}
static void printParameters(const Acts::Surface &surface, const Acts::GeometryContext &tgContext, const Acts::BoundVector &bound)
void TrackStatePrinter::printParameters(const Acts::Surface &surface, const Acts::GeometryContext &tgContext, const Acts::BoundVector &bound)
{
auto p = Acts::transformBoundToFreeParameters(surface, tgContext, bound);
std::cout << std::fixed
......@@ -409,15 +400,14 @@ namespace ActsTrk
<< std::defaultfloat << std::setprecision(-1);
}
} // anonymous namespace
/// =========================================================================
/// TrackStatePrinter class method definitions
/// =========================================================================
/// =========================================================================
namespace ActsTrk
{
TrackStatePrinter::TrackStatePrinter(const std::string &type,
const std::string &name,
const IInterface *parent)
: base_class(type, name, parent)
: AthAlgTool(type, name, parent)
{
}
......@@ -474,126 +464,6 @@ namespace ActsTrk
<< std::flush;
}
void
TrackStatePrinter::printTrack(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackContainer &tracks,
const ActsTrk::MutableTrackContainer::TrackProxy &track,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset) const
{
const auto lastMeasurementIndex = track.tipIndex();
// to print track states from inside outward, we need to reverse the order of visitBackwards().
std::vector<ActsTrk::MutableTrackStateBackend::ConstTrackStateProxy> states;
states.reserve(lastMeasurementIndex + 1); // could be an overestimate
size_t npixel = 0, nstrip = 0;
tracks.trackStateContainer().visitBackwards(
lastMeasurementIndex,
[&states, &npixel, &nstrip](const ActsTrk::MutableTrackStateBackend::ConstTrackStateProxy &state) -> void
{
if (state.hasCalibrated())
{
if (state.calibratedSize() == 1)
++nstrip;
else if (state.calibratedSize() == 2)
++npixel;
}
states.push_back(state);
});
if (track.nMeasurements() + track.nOutliers() != npixel + nstrip)
{
ATH_MSG_WARNING("Track has " << track.nMeasurements() + track.nOutliers() << " measurements + outliers, but "
<< npixel + nstrip << " pixel + strip hits");
}
const Acts::BoundTrackParameters per(track.referenceSurface().getSharedPtr(),
track.parameters(),
track.covariance(),
track.particleHypothesis());
std::cout << std::setw(5) << lastMeasurementIndex << ' '
<< std::left
<< std::setw(4) << "parm" << ' '
<< std::setw(21) << actsSurfaceName(per.referenceSurface()) << ' '
<< std::setw(22) << to_string("#hit=", npixel, '/', nstrip, ", #hole=", track.nHoles()) << ' '
<< std::right;
printParameters(per.referenceSurface(), tgContext, per.parameters());
std::cout << std::fixed << std::setw(8) << ' '
<< std::setw(7) << std::setprecision(1) << track.chi2() << ' '
<< std::left
<< "#out=" << track.nOutliers()
<< ", #sh=" << track.nSharedHits()
<< std::right << std::defaultfloat << std::setprecision(-1) << '\n';
for (auto i = states.size(); i > 0;)
{
printTrackState(tgContext, states[--i], container_offset);
}
}
void
TrackStatePrinter::printTrackState(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackStateBackend::ConstTrackStateProxy &state,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset,
bool useFiltered) const
{
if (!m_printFilteredStates && useFiltered)
return;
ptrdiff_t index = -1;
if (state.hasUncalibratedSourceLink())
{
ATLASUncalibSourceLink sl = state.getUncalibratedSourceLink().template get<ATLASUncalibSourceLink>();
index = (*sl)->index();
for (const auto &[container, offset] : container_offset)
{
if ((*sl)->container() == container)
{
index += offset;
break;
}
}
}
std::cout << std::setw(5) << state.index() << ' ';
char ptype = !m_printFilteredStates ? ' '
: useFiltered ? 'F'
: 'S';
if (state.hasCalibrated())
{
std::cout << ptype << std::setw(2) << state.calibratedSize() << 'D';
}
else if (state.typeFlags().test(Acts::TrackStateFlag::HoleFlag))
{
std::cout << std::setw(4) << "hole";
}
else
{
std::cout << ptype << std::setw(3) << " ";
}
std::cout << ' '
<< std::left
<< std::setw(21) << actsSurfaceName(state.referenceSurface()) << ' ';
if (index >= 0)
{
std::cout << std::setw(22) << index << ' ';
}
else
{
std::cout << std::setw(22) << to_string(state.referenceSurface().geometryId()) << ' ';
}
std::cout << std::right;
const auto &parameters = !useFiltered ? state.parameters()
: state.hasFiltered() ? state.filtered()
: state.predicted();
printParameters(state.referenceSurface(), tgContext, parameters);
std::cout << ' '
<< std::fixed
<< std::setw(6) << std::setprecision(1) << state.pathLength() << ' '
<< std::setw(7) << std::setprecision(1) << state.chi2() << ' '
<< std::defaultfloat << std::setprecision(-1)
<< std::setw(Acts::TrackStateFlag::NumTrackStateFlags) << trackStateName(state.typeFlags()) << '\n';
}
void
TrackStatePrinter::printMeasurements(const EventContext &ctx,
const std::vector<const xAOD::UncalibratedMeasurementContainer *> &clusterContainers,
......
Tracking/Acts/ActsTrackReconstruction/src/TrackStatePrinter.h
+ 35
− 12
View file @ 016fcc18
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSTRKFINDINGTOOL_TRACKSTATEPRINTER_H
#define ACTSTRKFINDINGTOOL_TRACKSTATEPRINTER_H 1
#ifndef ACTSTRACKRECONSTRUCTION_TRACKSTATEPRINTER_H
#define ACTSTRACKRECONSTRUCTION_TRACKSTATEPRINTER_H 1
// Base
#include "src/ITrackStatePrinter.h"
#include "AthenaBaseComps/AthAlgTool.h"
// ATHENA
#include "GeoPrimitives/GeoPrimitives.h"
#include "GaudiKernel/EventContext.h"
#include "StoreGate/ReadHandleKeyArray.h"
#include "xAODInDetMeasurement/SpacePoint.h"
#include "xAODMeasurementBase/UncalibratedMeasurementContainer.h"
// ACTS CORE
#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/EventData/TrackParameters.hpp"
#include "Acts/EventData/TrackStateType.hpp"
// PACKAGE
#include "ActsGeometry/ATLASSourceLink.h"
#include "ActsEvent/Seed.h"
#include "ActsEvent/TrackContainer.h"
#include "ActsGeometryInterfaces/ActsGeometryContext.h"
#include "ActsGeometryInterfaces/IActsTrackingGeometryTool.h"
#include "xAODInDetMeasurement/SpacePointContainer.h"
#include "ActsEventCnv/IActsToTrkConverterTool.h"
// Other
#include <vector>
#include <memory>
#include <tuple>
#include <boost/container/small_vector.hpp>
namespace Acts
{
class Surface;
}
namespace InDetDD
{
class SiDetectorElementCollection;
......@@ -34,7 +47,7 @@ namespace InDetDD
namespace ActsTrk
{
class TrackStatePrinter : public extends<AthAlgTool, ActsTrk::ITrackStatePrinter>
class TrackStatePrinter : virtual public AthAlgTool
{
public:
TrackStatePrinter(const std::string &type, const std::string &name,
......@@ -48,7 +61,7 @@ namespace ActsTrk
printMeasurements(const EventContext &ctx,
const std::vector<const xAOD::UncalibratedMeasurementContainer *> &clusterContainers,
const std::vector<const InDetDD::SiDetectorElementCollection *> &detectorElementCollections,
const std::vector<size_t> &offsets) const override;
const std::vector<size_t> &offsets) const;
void
printSeed(const Acts::GeometryContext &tgContext,
......@@ -56,19 +69,21 @@ namespace ActsTrk
const Acts::BoundTrackParameters &initialParameters,
size_t measurementOffset,
size_t iseed,
bool isKF) const override;
bool isKF) const;
template <typename track_container_t>
void
printTrack(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackContainer &tracks,
const ActsTrk::MutableTrackContainer::TrackProxy &track,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &offset) const override;
const track_container_t &tracks,
const typename track_container_t::TrackProxy &track,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &offset) const;
template <typename track_state_proxy_t>
void
printTrackState(const Acts::GeometryContext &tgContext,
const ActsTrk::MutableTrackStateBackend::ConstTrackStateProxy &state,
const track_state_proxy_t &state,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset,
bool useFiltered = false) const override;
bool useFiltered = false) const;
using MeasurementInfo = std::tuple<size_t,
const ATLASUncalibSourceLink *,
......@@ -102,8 +117,16 @@ namespace ActsTrk
const std::vector<small_vector<const xAOD::SpacePoint *>> &measToSp,
const InDetDD::SiDetectorElementCollection *detectorElements,
size_t offset) const;
// static member functions used by TrackStatePrinter.icc
static void printParameters(const Acts::Surface &surface, const Acts::GeometryContext &tgContext, const Acts::BoundVector &bound);
static std::string actsSurfaceName(const Acts::Surface &surface);
static std::string trackStateName(Acts::ConstTrackStateType trackStateType);
};
} // namespace
#include "src/TrackStatePrinter.icc"
#endif
Tracking/Acts/ActsTrackReconstruction/src/TrackStatePrinter.icc 0 → 100644
+ 157
− 0
View file @ 016fcc18
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSTRACKRECONSTRUCTION_TRACKSTATEPRINTER_ICC
#define ACTSTRACKRECONSTRUCTION_TRACKSTATEPRINTER_ICC 1
// ATHENA
#include "xAODMeasurementBase/UncalibratedMeasurementContainer.h"
#include "ActsGeometry/ATLASSourceLink.h"
// ACTS CORE
#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/EventData/TrackParameters.hpp"
// Other
#include <iostream>
#include <sstream>
namespace ActsTrk
{
/// format all arguments and return as a string.
/// Used here to apply std::setw() to the combination of values.
template <typename... Types>
static std::string to_string(Types &&...values)
{
std::ostringstream os;
(os << ... << values);
return os.str();
}
template <typename track_container_t>
void
TrackStatePrinter::printTrack(const Acts::GeometryContext &tgContext,
const track_container_t &tracks,
const typename track_container_t::TrackProxy &track,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset) const
{
const auto lastMeasurementIndex = track.tipIndex();
// to print track states from inside outward, we need to reverse the order of visitBackwards().
using PrintTrackStateContainer = std::decay_t<decltype(tracks.trackStateContainer())>;
std::vector<typename PrintTrackStateContainer::ConstTrackStateProxy> states;
states.reserve(lastMeasurementIndex + 1); // could be an overestimate
size_t npixel = 0, nstrip = 0;
tracks.trackStateContainer().visitBackwards(
lastMeasurementIndex,
[&states, &npixel, &nstrip](const PrintTrackStateContainer::ConstTrackStateProxy &state) -> void
{
if (state.hasCalibrated())
{
if (state.calibratedSize() == 1)
++nstrip;
else if (state.calibratedSize() == 2)
++npixel;
}
states.push_back(state);
});
if (track.nMeasurements() + track.nOutliers() != npixel + nstrip)
{
ATH_MSG_WARNING("Track has " << track.nMeasurements() + track.nOutliers() << " measurements + outliers, but "
<< npixel + nstrip << " pixel + strip hits");
}
const Acts::BoundTrackParameters per(track.referenceSurface().getSharedPtr(),
track.parameters(),
track.covariance(),
track.particleHypothesis());
std::cout << std::setw(5) << lastMeasurementIndex << ' '
<< std::left
<< std::setw(4) << "parm" << ' '
<< std::setw(21) << actsSurfaceName(per.referenceSurface()) << ' '
<< std::setw(22) << to_string("#hit=", npixel, '/', nstrip, ", #hole=", track.nHoles()) << ' '
<< std::right;
printParameters(per.referenceSurface(), tgContext, per.parameters());
std::cout << std::fixed << std::setw(8) << ' '
<< std::setw(7) << std::setprecision(1) << track.chi2() << ' '
<< std::left
<< "#out=" << track.nOutliers()
<< ", #sh=" << track.nSharedHits()
<< std::right << std::defaultfloat << std::setprecision(-1) << '\n';
for (auto i = states.size(); i > 0;)
{
printTrackState(tgContext, states[--i], container_offset);
}
}
template <typename track_state_proxy_t>
void
TrackStatePrinter::printTrackState(const Acts::GeometryContext &tgContext,
const track_state_proxy_t &state,
const std::vector<std::pair<const xAOD::UncalibratedMeasurementContainer *, size_t>> &container_offset,
bool useFiltered) const
{
if (!m_printFilteredStates && useFiltered)
return;
ptrdiff_t index = -1;
if (state.hasUncalibratedSourceLink())
{
ATLASUncalibSourceLink sl = state.getUncalibratedSourceLink().template get<ATLASUncalibSourceLink>();
index = (*sl)->index();
for (const auto &[container, offset] : container_offset)
{
if ((*sl)->container() == container)
{
index += offset;
break;
}
}
}
std::cout << std::setw(5) << state.index() << ' ';
char ptype = !m_printFilteredStates ? ' '
: useFiltered ? 'F'
: 'S';
if (state.hasCalibrated())
{
std::cout << ptype << std::setw(2) << state.calibratedSize() << 'D';
}
else if (state.typeFlags().test(Acts::TrackStateFlag::HoleFlag))
{
std::cout << std::setw(4) << "hole";
}
else
{
std::cout << ptype << std::setw(3) << " ";
}
std::cout << ' '
<< std::left
<< std::setw(21) << actsSurfaceName(state.referenceSurface()) << ' ';
if (index >= 0)
{
std::cout << std::setw(22) << index << ' ';
}
else
{
std::cout << std::setw(22) << to_string(state.referenceSurface().geometryId()) << ' ';
}
std::cout << std::right;
const auto &parameters = !useFiltered ? state.parameters()
: state.hasFiltered() ? state.filtered()
: state.predicted();
printParameters(state.referenceSurface(), tgContext, parameters);
std::cout << ' '
<< std::fixed
<< std::setw(6) << std::setprecision(1) << state.pathLength() << ' '
<< std::setw(7) << std::setprecision(1) << state.chi2() << ' '
<< std::defaultfloat << std::setprecision(-1)
<< std::setw(Acts::TrackStateFlag::NumTrackStateFlags) << trackStateName(state.typeFlags()) << '\n';
}
} // namespace ActsTrk
#endif
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