Skip to content

ITS: add common vertex definition and neighbours per road #14583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f3sch merged 1 commit into from
Aug 14, 2025
Merged

ITS: add common vertex definition and neighbours per road #14583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace o2::its

struct TrackingParameters {
int CellMinimumLevel() const noexcept { return MinTrackLength - constants::ClustersPerCell + 1; }
int NeighboursPerRoad() const noexcept { return NLayers - 3; }
int CellsPerRoad() const noexcept { return NLayers - 2; }
int TrackletsPerRoad() const noexcept { return NLayers - 1; }
std::string asString() const;
Expand Down
12 changes: 9 additions & 3 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Definitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
#ifndef TRACKINGITS_DEFINITIONS_H_
#define TRACKINGITS_DEFINITIONS_H_

#ifndef GPUCA_GPUCODE_DEVICE
#include <array>
#endif
#include "ReconstructionDataFormats/Vertex.h"

#ifdef CA_DEBUG
#define CA_DEBUGGER(x) x
Expand All @@ -26,4 +24,12 @@
do { \
} while (0)
#endif

namespace o2::its
{

using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

}

#endif
1 change: 0 additions & 1 deletion Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ namespace gpu
template <int>
class TimeFrameGPU;
}
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

template <int nLayers = 7>
struct TimeFrame {
Expand Down
5 changes: 1 addition & 4 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackerTraits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@
#ifndef TRACKINGITSU_INCLUDE_TRACKERTRAITS_H_
#define TRACKINGITSU_INCLUDE_TRACKERTRAITS_H_

#include <cmath>
#include <oneapi/tbb.h>

#include "DetectorsBase/Propagator.h"
#include "ITStracking/Configuration.h"
#include "ITStracking/MathUtils.h"
#include "ITStracking/TimeFrame.h"
#include "ITStracking/BoundedAllocator.h"

#include <oneapi/tbb.h>
#include <oneapi/tbb/partitioner.h>

// #define OPTIMISATION_OUTPUT

namespace o2
Expand Down
4 changes: 1 addition & 3 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Vertexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,15 @@
#include <oneapi/tbb/task_arena.h>

#include "ITStracking/Constants.h"
#include "ITStracking/Definitions.h"
#include "ITStracking/Configuration.h"
#include "ITStracking/TimeFrame.h"
#include "ITStracking/VertexerTraits.h"
#include "ITStracking/BoundedAllocator.h"
#include "ReconstructionDataFormats/Vertex.h"

namespace o2::its
{

using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

class Vertexer
{
static constexpr int NLayers{7};
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ void TrackerTraits<nLayers>::findCellsNeighbours(const int iteration)
};

mTaskArena->execute([&] {
for (int iLayer{0}; iLayer < mTrkParams[iteration].CellsPerRoad() - 1; ++iLayer) {
for (int iLayer{0}; iLayer < mTrkParams[iteration].NeighboursPerRoad(); ++iLayer) {
deepVectorClear(mTimeFrame->getCellsNeighbours()[iLayer]);
deepVectorClear(mTimeFrame->getCellsNeighboursLUT()[iLayer]);
if (mTimeFrame->getCells()[iLayer + 1].empty() ||
Expand Down
4 changes: 1 addition & 3 deletions Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/TrackReaderSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include "Framework/DataProcessorSpec.h"
#include "Framework/Task.h"
#include "Headers/DataHeader.h"
#include "ITStracking/Definitions.h"
#include "DataFormatsITS/TrackITS.h"
#include "SimulationDataFormat/MCCompLabel.h"
#include "SimulationDataFormat/MCTruthContainer.h"
#include "DataFormatsITSMFT/ROFRecord.h"
#include "ReconstructionDataFormats/Vertex.h"

namespace o2
{
Expand All @@ -33,8 +33,6 @@ namespace its

class TrackReader : public o2::framework::Task
{
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

public:
TrackReader(bool useMC = true);
~TrackReader() override = default;
Expand Down
4 changes: 1 addition & 3 deletions Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/VertexReaderSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "Framework/DataProcessorSpec.h"
#include "Framework/Task.h"
#include "ReconstructionDataFormats/Vertex.h"
#include "ITStracking/Definitions.h"
#include "DataFormatsITSMFT/ROFRecord.h"

namespace o2
Expand All @@ -30,8 +30,6 @@ namespace its

class VertexReader : public o2::framework::Task
{
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

public:
VertexReader() = default;
~VertexReader() override = default;
Expand Down
3 changes: 1 addition & 2 deletions Detectors/ITSMFT/ITS/workflow/src/TrackWriterSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "DataFormatsITSMFT/ROFRecord.h"
#include "SimulationDataFormat/MCCompLabel.h"
#include "SimulationDataFormat/MCTruthContainer.h"
#include "ReconstructionDataFormats/Vertex.h"
#include "ITStracking/Definitions.h"
#include "ITStracking/TrackingConfigParam.h"

using namespace o2::framework;
Expand All @@ -28,7 +28,6 @@ namespace o2
{
namespace its
{
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

template <typename T>
using BranchDefinition = MakeRootTreeWriterSpec::BranchDefinition<T>;
Expand Down
3 changes: 1 addition & 2 deletions Detectors/ITSMFT/ITS/workflow/src/TrackerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
#include "Framework/ConfigParamRegistry.h"
#include "Framework/CCDBParamSpec.h"
#include "ITSWorkflow/TrackerSpec.h"
#include "ITStracking/Definitions.h"
#include "ITStracking/TrackingConfigParam.h"

namespace o2
{
using namespace framework;
namespace its
{
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;

TrackerDPL::TrackerDPL(std::shared_ptr<o2::base::GRPGeomRequest> gr,
bool isMC,
int trgType,
Expand Down