Skip to content

Commit 72b2899

Browse files
mpucciompuccio
committed
Remove stale function
1 parent 1295950 commit 72b2899

9 files changed

Lines changed: 54 additions & 64 deletions

‎Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/Configuration.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ struct TrackingPlan {
139139
std::vector<IterationParameters> iterations;
140140
};
141141

142-
/// Reset tracking parameters to detector geometry defaults.
143-
void resetDetectorDefaults(TrackingParameters& params, o2::detectors::DetID::ID detId);
144-
145142
namespace TrackingMode
146143
{
147144
enum Type : int8_t {

‎Detectors/ITSMFT/common/tracking/src/Configuration.cxx‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,36 +51,6 @@ void resolveSystematicErrors(o2::itsmft::DetectorParameters& parameters, const C
5151
namespace o2::itsmft
5252
{
5353

54-
void resetDetectorDefaults(TrackingParameters& p, detectors::DetID::ID detId)
55-
{
56-
if (detId == detectors::DetID::ITS) {
57-
p = TrackingParameters{};
58-
p.MinPt.assign(tracking::ITSNLayers - tracking::kCAMinTrackLength + 1, 0.f);
59-
return;
60-
}
61-
62-
if (detId == detectors::DetID::MFT) {
63-
namespace mft = o2::mft::constants::mft;
64-
constexpr int nLayers = o2::mft::constants::mft::LayersNumber;
65-
66-
p = TrackingParameters{};
67-
p.NLayers = nLayers;
68-
p.LayerResolution.assign(nLayers, mft::Resolution);
69-
p.SystError2Row.assign(nLayers, 0.f);
70-
p.SystError2Col.assign(nLayers, 0.f);
71-
p.AddTimeError.assign(nLayers, 0u);
72-
p.ColBins = 64;
73-
p.RowBins = 128;
74-
p.UseDiamond = true;
75-
p.PerPrimaryVertexProcessing = false;
76-
p.StartLayerMask = (1u << nLayers) - 1u;
77-
p.MinPt.assign(MFTCATrackerParam::MaxTrackLength - MFTCATrackerParam::MinTrackLength + 1, 0.f);
78-
return;
79-
}
80-
81-
LOGP(fatal, "Unsupported detector id {} in resetDetectorDefaults", static_cast<int>(detId));
82-
}
83-
8454
namespace TrackingMode
8555
{
8656

@@ -122,11 +92,11 @@ std::string toString(Type mode)
12292

12393
TrackingPlan getTrackingPlan(detectors::DetID::ID detId, Type mode)
12494
{
125-
TrackingParameters defaults;
126-
resetDetectorDefaults(defaults, detId);
127-
TrackingPlan plan{std::move(static_cast<DetectorParameters&>(defaults)), {}, {}};
95+
TrackingPlan plan;
96+
IterationParameters defaults;
12897
auto& trackParams = plan.iterations;
12998
if (detId == detectors::DetID::ITS) {
99+
defaults.MinPt.assign(tracking::ITSNLayers - tracking::kCAMinTrackLength + 1, 0.f);
130100
if (mode == Async) {
131101
trackParams.assign(3, defaults);
132102
trackParams[1].TrackletMinPt = 0.2f;
@@ -149,6 +119,19 @@ TrackingPlan getTrackingPlan(detectors::DetID::ID detId, Type mode)
149119
plan.detector.ColBins = 64;
150120
plan.detector.RowBins = 32;
151121
} else if (detId == detectors::DetID::MFT) {
122+
namespace mft = o2::mft::constants::mft;
123+
constexpr int nLayers = mft::LayersNumber;
124+
plan.detector.LayerResolution.assign(nLayers, mft::Resolution);
125+
plan.detector.SystError2Row.assign(nLayers, 0.f);
126+
plan.detector.SystError2Col.assign(nLayers, 0.f);
127+
plan.detector.AddTimeError.assign(nLayers, 0u);
128+
plan.detector.ColBins = 64;
129+
plan.detector.RowBins = 128;
130+
defaults.NLayers = nLayers;
131+
defaults.UseDiamond = true;
132+
defaults.PerPrimaryVertexProcessing = false;
133+
defaults.StartLayerMask = (1u << nLayers) - 1u;
134+
defaults.MinPt.assign(MFTCATrackerParam::MaxTrackLength - MFTCATrackerParam::MinTrackLength + 1, 0.f);
152135
if (mode == Off) {
153136
return plan;
154137
}

‎Detectors/ITSMFT/common/tracking/test/TrackingParameterTestSupport.h‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,28 @@ struct ReferenceTrackingParameters : TrackingParameters {
3737
std::vector<float> LayerRadii = {2.33959f, 3.14076f, 3.91924f, 19.6213f, 24.5597f, 34.388f, 39.3329f};
3838
std::vector<float> LayerxX0 = {5.e-3f, 5.e-3f, 5.e-3f, 1.e-2f, 1.e-2f, 1.e-2f, 1.e-2f};
3939
};
40-
inline void resetDetectorDefaults(ReferenceTrackingParameters& parameters, o2::detectors::DetID::ID detector)
40+
// Fixed inputs for synthetic fixtures, independent of runtime configuration and field.
41+
inline TrackingParameters makeTestTrackingParameters(o2::detectors::DetID::ID detector)
4142
{
42-
o2::itsmft::resetDetectorDefaults(parameters, detector);
43+
TrackingParameters parameters;
44+
if (detector == o2::detectors::DetID::MFT) {
45+
parameters.NLayers = MFTNLayers;
46+
parameters.LayerResolution.assign(MFTNLayers, 5.e-4f);
47+
parameters.SystError2Row.assign(MFTNLayers, 0.f);
48+
parameters.SystError2Col.assign(MFTNLayers, 0.f);
49+
parameters.AddTimeError.assign(MFTNLayers, 0u);
50+
parameters.ColBins = 64;
51+
parameters.RowBins = 128;
52+
parameters.UseDiamond = true;
53+
parameters.PerPrimaryVertexProcessing = false;
54+
parameters.StartLayerMask = (1u << MFTNLayers) - 1u;
55+
parameters.MinPt.assign(MFTNLayers - 4 + 1, 0.f);
56+
}
57+
return parameters;
58+
}
59+
inline void resetReferenceTrackingParameters(ReferenceTrackingParameters& parameters, o2::detectors::DetID::ID detector)
60+
{
61+
static_cast<TrackingParameters&>(parameters) = makeTestTrackingParameters(detector);
4362
parameters.LayerRadii = ReferenceTrackingParameters{}.LayerRadii;
4463
if (detector == o2::detectors::DetID::MFT) {
4564
constexpr std::array<float, MFTNLayers> minima{2.1f, 2.1f, 2.1f, 2.1f, 2.1f, 2.1f, 3.1f, 3.1f, 3.5f, 3.5f};

‎Detectors/ITSMFT/common/tracking/test/testCombinedTrackingComposition.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ std::vector<DecodedCluster> buildItsHelixChainClusters(const std::vector<float>&
183183

184184
TrackingParameters makeItsParams()
185185
{
186-
TrackingParameters p;
187-
resetDetectorDefaults(p, o2::detectors::DetID::ITS);
186+
auto p = test::makeTestTrackingParameters(o2::detectors::DetID::ITS);
188187
// Tracklet formation needs a primary vertex to seed the search window
189188
// (TrackerTraits.cxx's forTracklets()): with UseDiamond=false (ITS's own
190189
// default) that must come from TimeFrame::getPrimaryVertices(), which
@@ -197,8 +196,7 @@ TrackingParameters makeItsParams()
197196

198197
TrackingParameters makeMftParams()
199198
{
200-
TrackingParameters p;
201-
resetDetectorDefaults(p, o2::detectors::DetID::MFT);
199+
auto p = test::makeTestTrackingParameters(o2::detectors::DetID::MFT);
202200
p.UseDiamond = true;
203201
p.CreateArtefactLabels = false;
204202
return p;

‎Detectors/ITSMFT/common/tracking/test/testComputeLayerCellsOrchestration.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ struct Rig : RigFrameStorage {
323323
mDet(det),
324324
mKinds(NLayers, kind)
325325
{
326-
resetDetectorDefaults(params[0], det);
326+
resetReferenceTrackingParameters(params[0], det);
327327
// This file bypasses computeLayerTracklets()'s phi/z/index-table cuts
328328
// entirely (candidates are injected directly, see
329329
// injectCandidateTracklets() below): clearing RebuildClusterLUT keeps

‎Detectors/ITSMFT/common/tracking/test/testComputeLayerTrackletsOrchestration.cxx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ std::vector<SurfaceDescriptor> makeCatalog(uint16_t nLayers, o2::detectors::DetI
8383
surfaces.back().referenceCoordinate = kind == SurfaceKind::Disk
8484
? o2::mft::constants::mft::LayerZCoordinate()[i % MFTNLayers]
8585
: 3.f + static_cast<float>(i);
86-
// Matches o2::itsmft::resetDetectorDefaults()'s per-detector LayerxX0
87-
// default, so TrackerTraits::initialiseTimeFrame()'s LegacyMaterialMismatch
88-
// compatibility check passes for these unperturbed fixtures.
86+
// Use the material from the detector surface catalog.
8987
const float xOverX0 = detector == o2::detectors::DetID::MFT ? kMFTSurfaces[i % MFTNLayers].material.xOverX0 : kITSSurfaces[i % ITSNLayers].material.xOverX0;
9088
surfaces.back().material.xOverX0 = xOverX0;
9189
surfaces.back().material.arealDensityGPerCm2 = xOverX0 * o2::its::constants::Radl * o2::its::constants::Rho;
@@ -156,7 +154,7 @@ TrackletSnapshot runFixture(o2::detectors::DetID::ID detector,
156154
TrackerTraits traits;
157155
std::shared_ptr<tbb::task_arena> arena;
158156
std::vector<ReferenceTrackingParameters> params(1);
159-
resetDetectorDefaults(params[0], detector);
157+
resetReferenceTrackingParameters(params[0], detector);
160158
params[0].UseDiamond = true;
161159
params[0].CreateArtefactLabels = false;
162160
params[0].PassFlags.reset();
@@ -424,7 +422,7 @@ BOOST_AUTO_TEST_CASE(PerTimeFrameValidationFailureLeavesEdgeArraysZeroFilledNotP
424422
TrackerTraits traits;
425423
std::shared_ptr<tbb::task_arena> arena;
426424
std::vector<ReferenceTrackingParameters> params(1);
427-
resetDetectorDefaults(params[0], o2::detectors::DetID::ITS);
425+
resetReferenceTrackingParameters(params[0], o2::detectors::DetID::ITS);
428426
params[0].PassFlags.reset();
429427
params[0].PassFlags.set(IterationStep::FirstPass, IterationStep::RebuildClusterLUT);
430428

‎Detectors/ITSMFT/common/tracking/test/testITSCommonCATrackingModeConfiguration.cxx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,16 @@ BOOST_FIXTURE_TEST_CASE(SyncStillSucceedsAfterFatalHandlerInstalled, FatalToExce
171171
BOOST_CHECK_NO_THROW(o2::itsmft::tracking::test::referenceTrackingParameters(o2::detectors::DetID::ITS, TrackingMode::Async));
172172
}
173173

174-
// Sync/Async/Cosmics require a configured magnetic-field singleton. The
175-
// detector defaults and the early-return Off path can be tested directly.
176-
177174
BOOST_AUTO_TEST_CASE(MFTDefaultsUseTheCommonFourHitSelection)
178175
{
179-
TrackingParameters params;
180-
resetDetectorDefaults(params, o2::detectors::DetID::MFT);
176+
const auto plan = TrackingMode::getTrackingPlan(o2::detectors::DetID::MFT, TrackingMode::Sync);
177+
BOOST_REQUIRE_EQUAL(plan.iterations.size(), 1);
181178

182179
BOOST_CHECK_EQUAL(MFTCATrackerParam::MinTrackLength, 4);
183-
BOOST_CHECK_EQUAL(params.MinPt.size(), static_cast<size_t>(tracking::MFTNLayers - 4 + 1));
184-
BOOST_CHECK_EQUAL(params.ColBins, 64);
185-
BOOST_CHECK_EQUAL(params.RowBins, 128);
180+
BOOST_CHECK_EQUAL(plan.iterations.front().MinTrackLength, 4);
181+
BOOST_CHECK_EQUAL(plan.iterations.front().MinPt.size(), static_cast<size_t>(tracking::MFTNLayers - 4 + 1));
182+
BOOST_CHECK_EQUAL(plan.detector.ColBins, 64);
183+
BOOST_CHECK_EQUAL(plan.detector.RowBins, 128);
186184
}
187185

188186
BOOST_FIXTURE_TEST_CASE(MFTOffStillReturnsEmptyNotFatal, FatalToExceptionFixture)

‎Detectors/ITSMFT/common/tracking/test/testTrackerFailureContract.cxx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,7 @@ std::vector<SurfaceDescriptor> makeITSTestCatalog()
171171
surfaces.push_back(SurfaceDescriptor{i, static_cast<uint8_t>(o2::detectors::DetID::ITS), SurfaceKind::Cylinder});
172172
surfaces.back().referenceCoordinate = kITSSurfaces[i].referenceCoordinate;
173173
surfaces.back().chartRange = {-20.f, 20.f};
174-
// Matches o2::itsmft::resetDetectorDefaults(..., DetID::ITS)'s LayerxX0
175-
// default, so TrackerTraits::initialiseTimeFrame()'s LegacyMaterialMismatch
176-
// compatibility check passes for these unperturbed fixtures.
174+
// Use the material from the detector surface catalog.
177175
const float xOverX0 = kITSSurfaces[i].material.xOverX0;
178176
surfaces.back().material.xOverX0 = xOverX0;
179177
surfaces.back().material.arealDensityGPerCm2 = xOverX0 * o2::its::constants::Radl * o2::its::constants::Rho;
@@ -224,7 +222,7 @@ Fixture makeFixture()
224222
std::vector<TrackingParameters> makeOneIterationITSParams(bool dropTFUponFailure, size_t maxMemory = std::numeric_limits<size_t>::max())
225223
{
226224
std::vector<TrackingParameters> params(1);
227-
resetDetectorDefaults(params[0], o2::detectors::DetID::ITS);
225+
params[0] = test::makeTestTrackingParameters(o2::detectors::DetID::ITS);
228226
params[0].DropTFUponFailure = dropTFUponFailure;
229227
params[0].MaxMemory = maxMemory;
230228
return params;
@@ -237,8 +235,8 @@ std::vector<TrackingParameters> makeOneIterationITSParams(bool dropTFUponFailure
237235
std::vector<TrackingParameters> makeTwoIterationITSParams(bool dropTFUponFailure)
238236
{
239237
std::vector<TrackingParameters> params(2);
240-
resetDetectorDefaults(params[0], o2::detectors::DetID::ITS);
241-
resetDetectorDefaults(params[1], o2::detectors::DetID::ITS);
238+
params[0] = test::makeTestTrackingParameters(o2::detectors::DetID::ITS);
239+
params[1] = test::makeTestTrackingParameters(o2::detectors::DetID::ITS);
242240
params[1].PassFlags = IterationSteps{IterationStep::RebuildClusterLUT};
243241
for (auto& p : params) {
244242
p.DropTFUponFailure = dropTFUponFailure;

‎Detectors/ITSMFT/common/tracking/test/testWorkflowSession.cxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ struct Rig {
4949

5050
explicit Rig(bool drop = false, size_t memory = std::numeric_limits<size_t>::max())
5151
{
52-
TrackingParameters parameters;
53-
resetDetectorDefaults(parameters, Detector);
52+
auto parameters = test::makeTestTrackingParameters(Detector);
5453
parameters.UseDiamond = true;
5554
auto plan = test::makeTrackingPlan(parameters);
5655
plan.execution = {memory, drop};

0 commit comments

Comments
 (0)