Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ namespace o2::its
{
class ITSTrackingInterface
{
public:
static constexpr int NLayers{7};
using VertexerN = Vertexer<NLayers>;
using VertexerTraitsN = VertexerTraits<NLayers>;
using TrackerN = Tracker<NLayers>;
using TrackerTraitsN = TrackerTraits<NLayers>;
using TimeFrameN = TimeFrame<NLayers>;

public:
ITSTrackingInterface(bool isMC,
bool doStag,
int trgType,
Expand Down Expand Up @@ -80,6 +80,7 @@ class ITSTrackingInterface
TimeFrameN* mTimeFrame = nullptr;

protected:
virtual void requestTopologyDictionary(framework::ProcessingContext& pc);
virtual void loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
Expand All @@ -98,7 +99,7 @@ class ITSTrackingInterface
const o2::itsmft::TopologyDictionary* mDict = nullptr;
std::unique_ptr<TrackerN> mTracker = nullptr;
std::unique_ptr<VertexerN> mVertexer = nullptr;
const o2::dataformats::MeanVertexObject* mMeanVertex;
const o2::dataformats::MeanVertexObject* mMeanVertex{};
std::shared_ptr<BoundedMemoryResource> mMemoryPool;
std::shared_ptr<tbb::task_arena> mTaskArena;
};
Expand Down
7 changes: 6 additions & 1 deletion Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void ITSTrackingInterface::updateTimeDependentParams(framework::ProcessingContex
}
if (!initOnceDone) { // this params need to be queried only once
initOnceDone = true;
pc.inputs().get<o2::itsmft::TopologyDictionary*>("itscldict"); // just to trigger the finaliseCCDB
requestTopologyDictionary(pc);
pc.inputs().get<o2::itsmft::DPLAlpideParam<o2::detectors::DetID::ITS>*>("itsalppar");
if (pc.inputs().getPos("itsTGeo") >= 0) {
pc.inputs().get<o2::its::GeometryTGeo*>("itsTGeo");
Expand Down Expand Up @@ -474,6 +474,11 @@ void ITSTrackingInterface::setTraitsFromProvider(VertexerTraitsN* vertexerTraits
mVertexer->setMemoryPool(mMemoryPool);
}

void ITSTrackingInterface::requestTopologyDictionary(framework::ProcessingContext& pc)
{
pc.inputs().get<o2::itsmft::TopologyDictionary*>("itscldict"); // just to trigger the finaliseCCDB
}

void ITSTrackingInterface::loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
Expand Down
3 changes: 2 additions & 1 deletion Detectors/ITSMFT/ITS/tracking/src/Vertexer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ float Vertexer<NLayers>::clustersToVertices(LogFunc logger)

// update LUT with all currently found vertices so in second iteration we can check vertPerROFThreshold
sortVertices();
mTimeFrame->updateROFVertexLookupTable();
}
} catch (const BoundedMemoryResource::MemoryLimitExceeded& err) {
handleException(err);
Expand Down Expand Up @@ -126,6 +125,8 @@ void Vertexer<NLayers>::sortVertices()
}
mc.swap(sortedMC);
}
// update LUT after sorting
mTimeFrame->updateROFVertexLookupTable();
}

template <int NLayers>
Expand Down
2 changes: 0 additions & 2 deletions Detectors/ITSMFT/common/reconstruction/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ o2_target_root_dictionary(
include/ITSMFTReconstruction/DigitPixelReader.h
include/ITSMFTReconstruction/RawPixelReader.h
include/ITSMFTReconstruction/PixelData.h
include/ITSMFTReconstruction/Clusterer.h
include/ITSMFTReconstruction/ClustererParam.h
include/ITSMFTReconstruction/BuildTopologyDictionary.h
include/ITSMFTReconstruction/LookUp.h
Expand All @@ -67,4 +66,3 @@ if (OpenMP_CXX_FOUND)
target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
endif()

Loading