Skip to content

Commit 6e3d7b9

Browse files
committed
Move StrangenessTracking to Vertexing dir.
Hopefully this will allow to avoid circular dependencies in previously generated cmakefiles
1 parent e9e0417 commit 6e3d7b9

10 files changed

Lines changed: 18 additions & 28 deletions

File tree

Detectors/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_subdirectory(FOCAL)
3636
add_subdirectory(GlobalTracking)
3737
add_subdirectory(GlobalTrackingWorkflow)
3838
add_subdirectory(Vertexing)
39-
add_subdirectory(StrangenessTracking)
39+
4040
if(BUILD_ANALYSIS)
4141
add_subdirectory(AOD)
4242
endif()

Detectors/StrangenessTracking/CMakeLists.txt

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

Detectors/Vertexing/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
# add_compile_options(-O0 -g -fPIC)
1313

14+
add_subdirectory(StrangenessTracking)
15+
1416
o2_add_library(DetectorsVertexing
1517
TARGETVARNAME targetName
1618
SOURCES src/PVertexer.cxx

Detectors/StrangenessTracking/tracking/CMakeLists.txt renamed to Detectors/Vertexing/StrangenessTracking/CMakeLists.txt

File renamed without changes.

Detectors/StrangenessTracking/tracking/include/StrangenessTracking/IndexTableUtils.h renamed to Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/IndexTableUtils.h

File renamed without changes.

Detectors/StrangenessTracking/tracking/include/StrangenessTracking/StrangenessTracker.h renamed to Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -257,20 +257,20 @@ class StrangenessTracker
257257
}
258258

259259
protected:
260-
bool mMCTruthON = false; /// flag availability of MC truth
261-
int mNThreads = 1; /// number of threads (externally driven)
262-
gsl::span<const TrackITS> mInputITStracks; // input ITS tracks
263-
std::vector<VBracket> mITSvtxBrackets; // time brackets for ITS tracks
264-
std::vector<int> mTracksIdxTable; // index table for ITS tracks
265-
std::vector<int> mInputClusterSizes; // input cluster sizes
266-
std::vector<ITSCluster> mInputITSclusters; // input ITS clusters
267-
gsl::span<const int> mInputITSidxs; // input ITS track-cluster indexes
268-
gsl::span<const V0> mInputV0tracks; // input V0 of decay daughters
269-
gsl::span<const V0Index> mInputV0Indices; // input V0 indices of decay daughters
270-
gsl::span<const Cascade> mInputCascadeTracks; // input cascade of decay daughters
260+
bool mMCTruthON = false; /// flag availability of MC truth
261+
int mNThreads = 1; /// number of threads (externally driven)
262+
gsl::span<const TrackITS> mInputITStracks; // input ITS tracks
263+
std::vector<VBracket> mITSvtxBrackets; // time brackets for ITS tracks
264+
std::vector<int> mTracksIdxTable; // index table for ITS tracks
265+
std::vector<int> mInputClusterSizes; // input cluster sizes
266+
std::vector<ITSCluster> mInputITSclusters; // input ITS clusters
267+
gsl::span<const int> mInputITSidxs; // input ITS track-cluster indexes
268+
gsl::span<const V0> mInputV0tracks; // input V0 of decay daughters
269+
gsl::span<const V0Index> mInputV0Indices; // input V0 indices of decay daughters
270+
gsl::span<const Cascade> mInputCascadeTracks; // input cascade of decay daughters
271271
gsl::span<const CascadeIndex> mInputCascadeIndices; // input cascade indices of decay daughters
272-
const MCLabContCl* mITSClsLabels = nullptr; /// input ITS Cluster MC labels
273-
MCLabSpan mITSTrkLabels; /// input ITS Track MC labels
272+
const MCLabContCl* mITSClsLabels = nullptr; /// input ITS Cluster MC labels
273+
MCLabSpan mITSTrkLabels; /// input ITS Track MC labels
274274

275275
std::vector<o2::its::TrackITS> mSortedITStracks; // sorted ITS tracks
276276
std::vector<int> mSortedITSindexes; // indexes of sorted ITS tracks
@@ -290,8 +290,8 @@ class StrangenessTracker
290290
o2::base::PropagatorImpl<float>::MatCorrType mCorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrNONE; // use mat correction
291291

292292
std::vector<std::vector<o2::track::TrackParCovF>> mDaughterTracks; // vector of daughter tracks (per thread)
293-
StrangeTrack mStrangeTrack; // structure containing updated mother and daughter track refs
294-
ClusAttachments mStructClus; // # of attached tracks, 1 for mother, 2 for daughter
293+
StrangeTrack mStrangeTrack; // structure containing updated mother and daughter track refs
294+
ClusAttachments mStructClus; // # of attached tracks, 1 for mother, 2 for daughter
295295

296296
ClassDefNV(StrangenessTracker, 1);
297297
};

Detectors/StrangenessTracking/tracking/include/StrangenessTracking/StrangenessTrackingConfigParam.h renamed to Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTrackingConfigParam.h

File renamed without changes.

Detectors/StrangenessTracking/tracking/src/StrangenessTracker.cxx renamed to Detectors/Vertexing/StrangenessTracking/src/StrangenessTracker.cxx

File renamed without changes.

Detectors/StrangenessTracking/tracking/src/StrangenessTrackingConfigParam.cxx renamed to Detectors/Vertexing/StrangenessTracking/src/StrangenessTrackingConfigParam.cxx

File renamed without changes.

Detectors/StrangenessTracking/tracking/src/StrangenessTrackingLinkDef.h renamed to Detectors/Vertexing/StrangenessTracking/src/StrangenessTrackingLinkDef.h

File renamed without changes.

0 commit comments

Comments
 (0)