Skip to content

Commit 15bb3be

Browse files
Maurice Coquetmpuccio
authored andcommitted
First try of full implemtentation of MFT CA tracking
1 parent 5680a3e commit 15bb3be

26 files changed

Lines changed: 450 additions & 1313 deletions

‎Detectors/ITSMFT/MFT/workflow/src/CATrackerSpec.cxx‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,17 @@ namespace o2::mft
4040
{
4141

4242
static_assert(o2::itsmft::tracking::ITSMFTTrackingInterfaceMFT::DetId == o2::detectors::DetID::MFT);
43-
static_assert(o2::itsmft::tracking::constants::MFTNLayers == o2::mft::constants::mft::LayersNumber);
4443

4544
namespace
4645
{
47-
template <typename TracksVec, typename ClusterIdxVec, typename ROFVec, typename LabelsVec, typename SeedPatternVec, typename ArtefactKeysVec, typename ArtefactMaskVec>
46+
template <typename TracksVec, typename ClusterIdxVec, typename ROFVec, typename LabelsVec, typename SeedPatternVec>
4847
void fillMFTOutputs(const o2::itsmft::tracking::TimeFrameMFT& tf,
4948
gsl::span<const o2::itsmft::ROFRecord> inputROFs,
5049
TracksVec& tracks,
5150
ClusterIdxVec& clusterIndices,
5251
ROFVec& trackROFs,
5352
LabelsVec& trackLabels,
5453
SeedPatternVec& seedPatterns,
55-
ArtefactKeysVec& artefactLabelKeys,
56-
ArtefactMaskVec& artefactTrackletMasks,
57-
ArtefactMaskVec& artefactCellMasks,
5854
bool useMC)
5955
{
6056
trackROFs.assign(inputROFs.begin(), inputROFs.end());
@@ -110,16 +106,6 @@ void fillMFTOutputs(const o2::itsmft::tracking::TimeFrameMFT& tf,
110106
trackROFs[iROF].setFirstEntry(rofEntries[iROF]);
111107
trackROFs[iROF].setNEntries(rofEntries[iROF + 1] - rofEntries[iROF]);
112108
}
113-
114-
if (useMC) {
115-
std::vector<uint64_t> keys;
116-
std::vector<uint16_t> trackletMasks;
117-
std::vector<uint16_t> cellMasks;
118-
tf.exportMCArtefactCoverage(keys, trackletMasks, cellMasks);
119-
artefactLabelKeys.assign(keys.begin(), keys.end());
120-
artefactTrackletMasks.assign(trackletMasks.begin(), trackletMasks.end());
121-
artefactCellMasks.assign(cellMasks.begin(), cellMasks.end());
122-
}
123109
}
124110
} // namespace
125111

@@ -138,9 +124,6 @@ void CATrackerDPL::run(ProcessingContext& pc)
138124
auto& allTracksMFT = pc.outputs().make<std::vector<o2::mft::TrackMFT>>(Output{"MFT", "TRACKS", 0});
139125
auto& allClusIdx = pc.outputs().make<std::vector<int>>(Output{"MFT", "TRACKCLSID", 0});
140126
auto& allSeedPatterns = pc.outputs().make<std::vector<uint16_t>>(Output{"MFT", "TRACKSEEDPAT", 0});
141-
auto& artefactLabelKeys = pc.outputs().make<std::vector<uint64_t>>(Output{"MFT", "TRACKMCEARTKEY", 0});
142-
auto& artefactTrackletMasks = pc.outputs().make<std::vector<uint16_t>>(Output{"MFT", "TRACKMCEARTTRK", 0});
143-
auto& artefactCellMasks = pc.outputs().make<std::vector<uint16_t>>(Output{"MFT", "TRACKMCEARTCELL", 0});
144127
std::vector<o2::MCCompLabel> allTrackLabels;
145128

146129
if (!mTracking.isActive()) {
@@ -176,9 +159,6 @@ void CATrackerDPL::run(ProcessingContext& pc)
176159
trackROFs,
177160
allTrackLabels,
178161
allSeedPatterns,
179-
artefactLabelKeys,
180-
artefactTrackletMasks,
181-
artefactCellMasks,
182162
mUseMC);
183163

184164
LOGP(info, "MFT CA pushed {} tracks in {} ROFs", allTracksMFT.size(), trackROFs.size());
@@ -269,9 +249,6 @@ DataProcessorSpec getCATrackerSpec(bool useMC, bool useGeom, bool useIRFrames, o
269249
outputs.emplace_back("MFT", "TRACKSEEDPAT", 0, Lifetime::Timeframe);
270250
if (useMC) {
271251
outputs.emplace_back("MFT", "TRACKSMCTR", 0, Lifetime::Timeframe);
272-
outputs.emplace_back("MFT", "TRACKMCEARTKEY", 0, Lifetime::Timeframe);
273-
outputs.emplace_back("MFT", "TRACKMCEARTTRK", 0, Lifetime::Timeframe);
274-
outputs.emplace_back("MFT", "TRACKMCEARTCELL", 0, Lifetime::Timeframe);
275252
}
276253

277254
return DataProcessorSpec{

‎Detectors/ITSMFT/MFT/workflow/src/TrackWriterSpec.cxx‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ DataProcessorSpec getTrackWriterSpec(bool useMC, bool useCA)
5757
"MFTTrackSeedPattern",
5858
(useCA ? 1 : 0),
5959
""},
60-
BranchDefinition<std::vector<uint64_t>>{InputSpec{"artefactKeys", "MFT", "TRACKMCEARTKEY", 0},
61-
"MFTMCArtefactLabelKeys",
62-
(useCA && useMC ? 1 : 0),
63-
""},
64-
BranchDefinition<std::vector<uint16_t>>{InputSpec{"artefactTrkMask", "MFT", "TRACKMCEARTTRK", 0},
65-
"MFTMCArtefactTrackletMask",
66-
(useCA && useMC ? 1 : 0),
67-
""},
68-
BranchDefinition<std::vector<uint16_t>>{InputSpec{"artefactCellMask", "MFT", "TRACKMCEARTCELL", 0},
69-
"MFTMCArtefactCellMask",
70-
(useCA && useMC ? 1 : 0),
71-
""},
7260
BranchDefinition<std::vector<o2::itsmft::ROFRecord>>{InputSpec{"ROframes", "MFT", "MFTTrackROF", 0},
7361
"MFTTracksROF",
7462
logger},

‎Detectors/ITSMFT/common/tracking/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ o2_add_library(ITSMFTTracking
3333
src/TrackerTraits.cxx
3434
src/CATracker.cxx
3535
src/TrackingInterface.cxx
36-
src/MFTForwardRefit.cxx
36+
src/MFTFwdTrackHelpers.cxx
3737
PUBLIC_LINK_LIBRARIES
3838
O2::ITSMFTTrackingParams
3939
O2::ITStracking

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

Lines changed: 0 additions & 53 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class Tracker
6767
template <int NLayers>
6868
using CATracker = Tracker<NLayers>;
6969

70-
using TrackerITS = Tracker<constants::ITSNLayers>;
71-
using TrackerMFT = Tracker<constants::MFTNLayers>;
70+
using TrackerITS = Tracker<ITSNLayers>;
71+
using TrackerMFT = Tracker<o2::mft::constants::mft::LayersNumber>;
7272
using CATrackerITS = TrackerITS;
7373
using CATrackerMFT = TrackerMFT;
7474

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
#include <cstdint>
2121
#include <type_traits>
2222

23-
#include "ITStracking/Constants.h"
24-
#include "ITSMFTTracking/LayerMask.h"
23+
#include "DetectorsCommonDataFormats/DetID.h"
24+
#include "DataFormatsITS/TrackITS.h"
2525
#include "DataFormatsITS/TimeEstBC.h"
26+
#include "ITSMFTTracking/Configuration.h"
27+
#include "ITSMFTTracking/LayerMask.h"
28+
#include "ITStracking/Constants.h"
2629
#include "ReconstructionDataFormats/Track.h"
2730
#include "ReconstructionDataFormats/TrackFwd.h"
2831
#include "GPUCommonDef.h"
@@ -188,6 +191,27 @@ class TrackSeedTpl final : public SeedBase<NLayers, TrackParT>
188191
template <int NLayers>
189192
using TrackSeed = TrackSeedTpl<NLayers, o2::track::TrackParCovF>;
190193

194+
template <int NLayers>
195+
struct CATrackTypeHelper {
196+
using type = o2::its::TrackITSExt;
197+
};
198+
199+
template <int NLayers>
200+
using CATrackType = typename CATrackTypeHelper<NLayers>::type;
201+
202+
/// Per-detector track parametrization stored in CA cells and extended seeds.
203+
template <int NLayers>
204+
struct CASeedTrackPar {
205+
static constexpr o2::detectors::DetID::ID DetId = detIdFromNLayers<NLayers>();
206+
using type = std::conditional_t<DetId == o2::detectors::DetID::MFT, o2::track::TrackParCovFwd, o2::track::TrackParCovF>;
207+
};
208+
209+
template <int NLayers>
210+
using CellSeedN = CellSeedTpl<typename CASeedTrackPar<NLayers>::type>;
211+
212+
template <int NLayers>
213+
using TrackSeedN = TrackSeedTpl<NLayers, typename CASeedTrackPar<NLayers>::type>;
214+
191215
} // namespace o2::itsmft::tracking
192216

193217
#endif /* ALICEO2_ITSMFT_TRACKING_INCLUDE_CACELL_H_ */

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

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,26 @@
2727
#include "CommonUtils/EnumFlags.h"
2828
#include "DetectorsBase/Propagator.h"
2929
#include "DetectorsCommonDataFormats/DetID.h"
30-
#include "ITSMFTTracking/Constants.h"
3130
#include "ITSMFTTracking/LayerMask.h"
31+
#include "ITSMFTTracking/TrackingConfigParam.h"
32+
#include "MFTTracking/Constants.h"
33+
#include "ITStracking/TrackingConfigParam.h"
34+
35+
namespace o2::itsmft::tracking
36+
{
37+
38+
constexpr int nLayersForDet(o2::detectors::DetID::ID detId)
39+
{
40+
return detId == o2::detectors::DetID::MFT ? o2::mft::constants::mft::LayersNumber : ITSNLayers;
41+
}
42+
43+
template <int NLayers>
44+
constexpr o2::detectors::DetID::ID detIdFromNLayers()
45+
{
46+
return NLayers == o2::mft::constants::mft::LayersNumber ? o2::detectors::DetID::MFT : o2::detectors::DetID::ITS;
47+
}
48+
49+
} // namespace o2::itsmft::tracking
3250

3351
namespace o2::itsmft
3452
{
@@ -60,7 +78,7 @@ struct TrackingParameters {
6078
std::string asString() const;
6179

6280
IterationSteps PassFlags{IterationStep::FirstPass, IterationStep::RebuildClusterLUT};
63-
int NLayers = tracking::constants::ITSNLayers;
81+
int NLayers = tracking::ITSNLayers;
6482
std::vector<uint32_t> AddTimeError = {0, 0, 0, 0, 0, 0, 0};
6583
std::vector<float> LayerZ = {16.333f + 1, 16.333f + 1, 16.333f + 1, 42.140f + 1, 42.140f + 1, 73.745f + 1, 73.745f + 1};
6684
std::vector<float> LayerColHalfExtent{}; // index-table column half extent (ITS: z, MFT: global x); falls back to LayerZ
@@ -175,4 +193,27 @@ struct VertexingParameters {
175193

176194
} // namespace o2::itsmft
177195

196+
namespace o2::itsmft::tracking
197+
{
198+
199+
/// MFT uses o2::itsmft::TrackerParamConfig; ITS production params stay in O2::ITStracking.
200+
template <o2::detectors::DetID::ID DetId>
201+
struct TrackerParamRef;
202+
203+
template <>
204+
struct TrackerParamRef<o2::detectors::DetID::MFT> {
205+
using Type = o2::itsmft::TrackerParamConfig<o2::detectors::DetID::MFT>;
206+
static const Type& get() { return Type::Instance(); }
207+
static constexpr int nLayers() { return Type::getNLayers(); }
208+
};
209+
210+
template <>
211+
struct TrackerParamRef<o2::detectors::DetID::ITS> {
212+
using Type = o2::its::TrackerParamConfig;
213+
static const Type& get() { return Type::Instance(); }
214+
static constexpr int nLayers() { return ITSNLayers; }
215+
};
216+
217+
} // namespace o2::itsmft::tracking
218+
178219
#endif /* ALICEO2_ITSMFT_TRACKING_CONFIGURATION_H_ */

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)