Skip to content

Commit fe3497a

Browse files
authored
chore: Update doxygen documentation format (acts-project#4427)
- Update the format of the doxygen comments from /** @brief --> /// @brief - Make the number of bins in the hough plane configurable
1 parent c15a64d commit fe3497a

File tree

7 files changed

+174
-164
lines changed

7 files changed

+174
-164
lines changed

Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/MuonHoughSeeder.hpp

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,26 @@ namespace ActsExamples {
3636
/// given station.
3737
class MuonHoughSeeder final : public IAlgorithm {
3838
public:
39-
/// config
39+
/// @brief Configuration object of the Hough seeder
4040
struct Config {
41+
/// @brief Container name of the truth segments (used for validation)
4142
std::string inTruthSegments{};
43+
/// @brief Container name of the space point collection
4244
std::string inSpacePoints{};
45+
/// @brief Container name of the output hough seed collection
4346
std::string outHoughMax{};
44-
45-
/** @brief Extra margin added to both y-sides of the eta-hough accumulator plane */
47+
/// @brief Extra margin added to both y-sides of the eta-hough accumulator plane
4648
double etaPlaneMarginIcept{10. * Acts::UnitConstants::cm};
47-
/** @brief Extra margin added to both y-sides of the phi-hough accumulator plane */
49+
/// @brief Extra margin added to both y-sides of the phi-hough accumulator plane
4850
double phiPlaneMarginIcept{10. * Acts::UnitConstants::cm};
51+
/// @brief Number of bins to scan tan (theta)
52+
unsigned nBinsTanTheta = 25;
53+
/// @brief Number of bins in y0 space (complementary to tan (theta))
54+
unsigned nBinsY0 = 25;
55+
/// @brief Number of bins to scan tan (phi)
56+
unsigned nBinsTanPhi = 10;
57+
/// @brief Number of bins in x0 space (omplementary to tan (phi))
58+
unsigned nBinsX0 = 10;
4959
};
5060

5161
MuonHoughSeeder(Config cfg, Acts::Logging::Level lvl);
@@ -63,46 +73,45 @@ class MuonHoughSeeder final : public IAlgorithm {
6373
const Config& config() const { return m_cfg; }
6474

6575
private:
66-
/** @brief Abbrivation of the HoughPlane_t */
76+
/// @brief Abbrivation of the HoughPlane_t
6777
using HoughPlane_t =
6878
Acts::HoughTransformUtils::HoughPlane<const MuonSpacePoint*>;
69-
/** @brief Abbrivation of the PeakFinder */
79+
/// @brief Abbrivation of the PeakFinder
7080
using PeakFinder_t = Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
7181
const MuonSpacePoint*>;
72-
/** @brief Abbrivation of the PeakFinder configuration object */
82+
/// @brief Abbrivation of the PeakFinder configuration object
7383
using PeakFinderCfg_t =
7484
Acts::HoughTransformUtils::PeakFinders::IslandsAroundMaxConfig;
75-
/** @brief Abbrivation of the HoughMaximum type returned by the PeakFinder */
85+
/// @brief Abbrivation of the HoughMaximum type returned by the PeakFinder
7686
using Maximum_t = PeakFinder_t::Maximum;
77-
/** @brief Abbrivation of the HoughMaximum vector */
87+
/// @brief Abbrivation of the HoughMaximum vector
7888
using MaximumVec_t = std::vector<Maximum_t>;
79-
/** @brief Abbrivation of the HoughTransform axis utils */
89+
/// @brief Abbrivation of the HoughTransform axis utils
8090
using AxisRange_t = Acts::HoughTransformUtils::HoughAxisRanges;
81-
/** @brief Abbrivation of the space point id */
91+
/// @brief Abbrivation of the space point id
8292
using MuonId = MuonSpacePoint::MuonId;
8393

84-
/** @brief Find eta maxima from the space point bucket and fills them into a new
85-
* maximum container
86-
* @param ctx: Algorithm context needed for the display of the truth-parameters
87-
* @param bucket: Spacepoint bucket of interest
88-
* @param plane: Allocated hough plane to be recycled for all hough searches in the event*/
94+
/// @brief Find eta maxima from the space point bucket and fills them into a new
95+
/// maximum container
96+
/// @param ctx: Algorithm context needed for the display of the truth-parameters
97+
/// @param bucket: Spacepoint bucket of interest
98+
/// @param plane: Allocated hough plane to be recycled for all hough searches in the event
8999
MuonHoughMaxContainer constructEtaMaxima(const AlgorithmContext& ctx,
90100
const MuonSpacePointBucket& bucket,
91101
HoughPlane_t& plane) const;
92-
/** @brief Extends the obtained eta maxima and tries to attach straight line parameters
93-
* in the non-precision plane (phi).
94-
*/
102+
/// @brief Extends the obtained eta maxima and tries to attach straight line parameters
103+
/// in the non-precision plane (phi).
95104
MuonHoughMaxContainer extendMaximaWithPhi(const AlgorithmContext& ctx,
96105
MuonHoughMaxContainer&& etaMaxima,
97106
HoughPlane_t& plane) const;
98107

99-
/** @brief Displays the found maxima onto a TCanvas
100-
* @param ctx: Algorithm context to fetch the truth segment parameters
101-
* @param bucketId: identifier of the bucket to display on the Canvas and also
102-
* to determine whether it's an eta / phi maximum
103-
* @param maxima: List of maxima from the PeakFinder
104-
* @param plane: Filled hough plane
105-
* @param axis: Axis range needed to interpret the hough binning */
108+
/// @brief Displays the found maxima onto a TCanvas
109+
/// @param ctx: Algorithm context to fetch the truth segment parameters
110+
/// @param bucketId: identifier of the bucket to display on the Canvas and also
111+
/// to determine whether it's an eta / phi maximum
112+
/// @param maxima: List of maxima from the PeakFinder
113+
/// @param plane: Filled hough plane
114+
/// @param axis: Axis range needed to interpret the hough binning
106115
void displayMaxima(const AlgorithmContext& ctx, const MuonId& bucketId,
107116
const MaximumVec_t& maxima, const HoughPlane_t& plane,
108117
const AxisRange_t& axis) const;

Examples/Algorithms/TrackFinding/src/MuonHoughSeeder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ ProcessCode MuonHoughSeeder::execute(const AlgorithmContext& ctx) const {
8787

8888
// configure the binning of the hough plane
8989
Acts::HoughTransformUtils::HoughPlaneConfig etaPlaneCfg;
90-
etaPlaneCfg.nBinsX = 25;
91-
etaPlaneCfg.nBinsY = 25;
90+
etaPlaneCfg.nBinsX = m_cfg.nBinsTanTheta;
91+
etaPlaneCfg.nBinsY = m_cfg.nBinsY0;
9292

9393
Acts::HoughTransformUtils::HoughPlaneConfig phiPlaneCfg;
94-
phiPlaneCfg.nBinsX = 10;
95-
phiPlaneCfg.nBinsY = 10;
94+
phiPlaneCfg.nBinsX = m_cfg.nBinsTanPhi;
95+
phiPlaneCfg.nBinsY = m_cfg.nBinsX0;
9696

9797
// instantiate the hough plane
9898
HoughPlane_t etaPlane{etaPlaneCfg};

Examples/Framework/include/ActsExamples/EventData/MuonHoughMaximum.hpp

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,31 @@
1010
#include "ActsExamples/EventData/MuonSpacePoint.hpp"
1111

1212
namespace ActsExamples {
13-
/** @brief EDM class to store the result from the HoughTransform pattern finding step. The class takes the
14-
* local line parameters of the transform in the precision direction
15-
* (tanAlpha, interceptY) if the transform, is performed to find an parameter
16-
* estimate in the bending direction or (tanAlpha, interceptY, tanBeta,
17-
* interceptX) if a second hough transform is performed on top of the first
18-
* transform to find the parameters in the complementary direction. Further, the
19-
* MuonHoughMaximum stores the list of all hits associated with the maximum. */
13+
/// @brief EDM class to store the result from the HoughTransform pattern finding step. The class takes the
14+
/// local line parameters of the transform in the precision direction
15+
/// (tanBeta, interceptY) if the transform, is performed to find an
16+
/// parameter estimate in the bending direction or (tanBeta, interceptY,
17+
/// tanAlpha, interceptX) if a second hough transform is performed on
18+
/// top of the first transform to find the parameters in the
19+
/// complementary direction. Further, the MuonHoughMaximum stores the
20+
/// list of all hits associated with the maximum.
2021
class MuonHoughMaximum {
2122
public:
2223
using HitVec = std::vector<const MuonSpacePoint*>;
23-
/** @brief Constructor taking the estimated hough parameters and the associated hits
24-
* @param tanBeta: Slope of the estimated line in precision direction
25-
* @param interceptY: Intercept of the line along the precision direction
26-
* @param assocHits: List of hits associated with these parameters */
24+
/// @brief Constructor taking the estimated hough parameters and the associated hits
25+
/// @param tanBeta: Slope of the estimated line in precision direction
26+
/// @param interceptY: Intercept of the line along the precision direction
27+
/// @param assocHits: List of hits associated with these parameters
2728
MuonHoughMaximum(const double tanBeta, const double interceptY,
2829
const HitVec& assocHits)
2930
: m_tanBeta{tanBeta}, m_interceptY{interceptY}, m_hits{assocHits} {}
30-
/** @brief Constructor taking the estimated hough parameters from a complementary hough transform
31-
* & the associated hits.
32-
* @param tanAlpha: Slope of the estimate line in the non-bending direction
33-
* @param interceptX: Intercept of the line along the non-bending direction
34-
* @param tanBeta: Slope of the estimated line in precision direction
35-
* @param interceptY: Intercept of the line along the precision direction
36-
* @param assocHits: List of hits associated with these parameters */
31+
/// @brief Constructor taking the estimated hough parameters from a complementary hough transform
32+
/// & the associated hits.
33+
/// @param tanAlpha: Slope of the estimate line in the non-bending direction
34+
/// @param interceptX: Intercept of the line along the non-bending direction
35+
/// @param tanBeta: Slope of the estimated line in precision direction
36+
/// @param interceptY: Intercept of the line along the precision direction
37+
/// @param assocHits: List of hits associated with these parameters
3738
MuonHoughMaximum(const double tanAlpha, const double interceptX,
3839
const double tanBeta, const double interceptY,
3940
const HitVec& assocHits)
@@ -42,15 +43,15 @@ class MuonHoughMaximum {
4243
m_tanBeta{tanBeta},
4344
m_interceptY{interceptY},
4445
m_hits{assocHits} {}
45-
/** @brief Return the slope along the non-bending direction */
46+
/// @brief Return the slope along the non-bending direction
4647
double tanAlpha() const { return m_tanAlpha; }
47-
/** @brief Return slope along the bending direction */
48+
/// @brief Return slope along the bending direction
4849
double tanBeta() const { return m_tanBeta; }
49-
/** @brief Return the intercept in the non-precision plane */
50+
/// @brief Return the intercept in the non-precision plane
5051
double interceptX() const { return m_interceptX; }
51-
/** @brief Return the intercept in the precision plane */
52+
/// @brief Return the intercept in the precision plane
5253
double interceptY() const { return m_interceptY; }
53-
/** @brief Return the associated hits */
54+
/// @brief Return the associated hits
5455
const HitVec& hits() const { return m_hits; }
5556

5657
private:

Examples/Framework/include/ActsExamples/EventData/MuonSegment.hpp

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,61 +19,63 @@ namespace ActsExamples {
1919
class MuonSegment {
2020
public:
2121
using MuonId = MuonSpacePoint::MuonId;
22-
/** @brief Empty default constructor */
22+
/// @brief Empty default constructor
2323
MuonSegment() = default;
24-
/** @brief Standard copy constructor */
24+
/// @brief Standard copy constructor
2525
MuonSegment(const MuonSegment& other) = default;
26-
/** @brief Standard move constructor */
26+
/// @brief Standard move constructor
2727
MuonSegment(MuonSegment&& other) = default;
28-
/** @brief Standard copy assignment */
28+
/// @brief Standard copy assignment
2929
MuonSegment& operator=(const MuonSegment& other) = default;
3030

31-
/** @brief Returns the reconstructed segment position in global coordinates */
31+
/// @brief Returns the reconstructed segment position in global coordinates
3232
const Acts::Vector3& globalPosition() const { return m_globPos; }
33-
/** @brief Returns the reconstructed segment direction in global coordinates */
33+
/// @brief Returns the reconstructed segment direction in global coordinates
3434
const Acts::Vector3& globalDirection() const { return m_globDir; }
35-
/** @brief Returns the reconstructed segment position expressed in the local space point frame*/
35+
/// @brief Returns the reconstructed segment position expressed in the local space point frame
3636
const Acts::Vector3& localPosition() const { return m_localPos; }
37-
/** @brief Returns the reconstructed segment direction expressed in the local space point frame*/
37+
/// @brief Returns the reconstructed segment direction expressed in the local space point frame
3838
const Acts::Vector3& localDirection() const { return m_localDir; }
39-
/** @brief Returns the associated MS sector identifier */
39+
/// @brief Returns the associated MS sector identifier
4040
const MuonId& id() const { return m_id; }
41-
/** @brief returns the fitted segment time & uncertainty */
41+
/// @brief returns the fitted segment time & uncertainty
4242
double time() const { return m_time; }
4343
double timeUncert() const { return m_timeError; }
44-
/** @brief Returns the chiSquared & degreed of freedom */
44+
/// @brief Returns the chiSquared & degreed of freedom
4545
double chiSquared() const { return m_chiSquared; }
4646
double nDoF() const { return m_nDoF; }
47-
/** @brief Returns the number of precision hits building the segment */
47+
/// @brief Returns the number of precision hits building the segment
4848
unsigned nPrecisionHits() const { return m_precisionHits; }
49-
/** @brief Returns the number of complementary trigger hits in the bending plane */
49+
/// @brief Returns the number of complementary trigger hits in the bending plane
5050
unsigned nTrigEtaLayers() const { return m_triEtaLayers; }
51-
/** @brief Returns the number of complementary trigger hits in the non-bending plane */
51+
/// @brief Returns the number of complementary trigger hits in the non-bending plane
5252
unsigned nTrigPhiLayers() const { return m_phiLayers; }
53-
/** @brief Set the global segment position & direction */
53+
/// @brief Set the global segment position & direction
5454
void setGlobalCoords(const Acts::Vector3& pos, const Acts::Vector3& dir) {
5555
m_globPos = pos;
5656
m_globDir = dir;
5757
}
58-
/** @brief Set the local segment position & direction */
58+
/// @brief Set the local segment position & direction
59+
/// @param pos: Position of the segment in the local frame
60+
/// @param dir: Direction of the segment in the local frame
5961
void setLocalCoords(const Acts::Vector3& pos, const Acts::Vector3& dir) {
6062
m_localPos = pos;
6163
m_localDir = dir;
6264
}
63-
/** @brief Set the Identifier */
65+
/// @brief Set the Identifier
6466
void setId(const MuonId& id) { m_id = id; }
65-
/** @brief Set the time & unceratinty */
67+
/// @brief Set the time & unceratinty
6668
void setTime(const double time, const double timeError) {
6769
m_time = time;
6870
m_timeError = timeError;
6971
}
70-
/** @brief Set the chi2 & the number of degrees of freedom */
72+
/// @brief Set the chi2 & the number of degrees of freedom
7173
void setFitQuality(const double chi2, const unsigned nDoF) {
7274
m_chiSquared = chi2;
7375
m_nDoF = nDoF;
7476
}
75-
/** @brief Set the segment hit summary in terms of precision hits (Straw/ Mm /sTgc)
76-
* & trigger eta (Rpc /Tgc) & trigger phi (Rpc / Tgc) hits */
77+
/// @brief Set the segment hit summary in terms of precision hits (Straw/ Mm /sTgc)
78+
/// & trigger eta (Rpc /Tgc) & trigger phi (Rpc / Tgc) hits
7779
void setHitSummary(unsigned nPrec, unsigned nTrigEta, unsigned nTrigPhi) {
7880
m_precisionHits = nPrec;
7981
m_triEtaLayers = nTrigEta;
@@ -86,18 +88,18 @@ class MuonSegment {
8688
Acts::Vector3 m_globDir{Acts::Vector3::Zero()};
8789
Acts::Vector3 m_localPos{Acts::Vector3::Zero()};
8890
Acts::Vector3 m_localDir{Acts::Vector3::Zero()};
89-
/** @brief Fitted segment time of arrival */
91+
/// @brief Fitted segment time of arrival
9092
double m_time{0.f};
91-
/** @brief Uncertainty on the time of arrival */
93+
/// @brief Uncertainty on the time of arrival
9294
double m_timeError{0.f};
93-
/** @brief segment chi2 & number of degrees of freedom */
95+
/// @brief segment chi2 & number of degrees of freedom
9496
double m_chiSquared{0.f};
9597
unsigned m_nDoF{0u};
96-
/** @brief how many precision hits are on the segment (Straw tubes or Mm) */
98+
/// @brief how many precision hits are on the segment (Straw tubes or Mm)
9799
unsigned m_precisionHits{0u};
98-
/** @brief Complementary hits in the non-bending direction (Rpc / Tgc / sTgc) */
100+
/// @brief Complementary hits in the non-bending direction (Rpc / Tgc / sTgc)
99101
unsigned m_phiLayers{0u};
100-
/** @brief Complementary hits in the bending direction (Rpc / Tgc) */
102+
/// @brief Complementary hits in the bending direction (Rpc / Tgc)
101103
unsigned m_triEtaLayers{0u};
102104
};
103105
using MuonSegmentContainer = std::vector<MuonSegment>;

0 commit comments

Comments
 (0)