Conversation
shahor02
commented
Sep 27, 2026
Comment on lines
+29
to
+34
| #include "DataFormatsITS/TrackITS.h" | ||
| #include "DataFormatsITSMFT/DPLAlpideParam.h" | ||
| #include "DataFormatsITSMFT/CompCluster.h" | ||
| #include "DataFormatsITSMFT/ROFRecord.h" | ||
| #include "DataFormatsITSMFT/TrkClusRef.h" | ||
| #include "DetectorsCommonDataFormats/DetID.h" |
Owner
Author
There was a problem hiding this comment.
convert to fwd declarations
Comment on lines
+337
to
+340
| struct ITSClusterReference { | ||
| int layer = -1; | ||
| int index = -1; | ||
| }; |
Owner
Author
There was a problem hiding this comment.
Why is this needed? In the staggered mode the cluster index is already ((0x1<<28) + index_in_layer), the same can be extended to refs of the ITS-TPC AB.
Comment on lines
+349
to
+351
| std::array<gsl::span<const o2::itsmft::ROFRecord>, NITSLayers> itsClustersROFRecordsPerLayer; | ||
| std::array<gsl::span<const o2::itsmft::CompClusterExt>, NITSLayers> itsClustersPerLayer; | ||
| std::array<gsl::span<const unsigned char>, NITSLayers> itsClustersPatternsPerLayer; |
Owner
Author
There was a problem hiding this comment.
To avoid dependencies on headers, I would use here (implementing the same also for the MFT)
o2::dataformats::AbstractRefAccessor<3, MaxITSlayers> itsClusters; // [ROF/Clus/Patt][7 slots also for non-staggered]
o2::dataformats::AbstractRefAccessor<3, MaxMFTlayers> itsClusters; // [ROF/Clus/Patt][10 slots also for non-staggered]
and for the non-staggered case would just use the 1st slot (nominally layer 0)
Can also provide getters for span of spans (span per layer)
Comment on lines
+526
to
+530
| auto getITSClusters() const | ||
| { | ||
| checkFlatITSClusterAccess(); | ||
| return getSpan<o2::itsmft::CompClusterExt>(GTrackID::ITS, CLUSTERS); | ||
| } |
Owner
Author
There was a problem hiding this comment.
would remove these methods w/o layer arg., which would simply default to 0.
| return getSpan<unsigned char>(GTrackID::ITS, PATTERNS); | ||
| } | ||
| bool hasITSClustersPerLayer() const { return itsClustersPerLayerLoaded; } | ||
| auto getITSClustersROFRecords(int layer) const { return itsClustersROFRecordsPerLayer[layer]; } |
Owner
Author
There was a problem hiding this comment.
i.e. simply
auto getITSClustersROFRecords(int layer=0) const {
return itsClustersROFRecordsPerLayer[layer];
}
Comment on lines
+558
to
+597
| ITSClusterReference getITSClusterReference(const o2::its::TrackITS& track, gsl::span<const int> clusterRefs, int clusterOrdinal) const | ||
| { | ||
| const auto clusterEntry = track.getClusterEntry(clusterOrdinal); | ||
| const auto clusterIndex = clusterRefs[clusterEntry]; | ||
| if (!hasITSClustersPerLayer()) { | ||
| return {-1, clusterIndex}; | ||
| } | ||
| return {getClusterLayer(track.getPattern(), clusterOrdinal, true), clusterIndex}; | ||
| } | ||
| ITSClusterReference getITSClusterReference(const o2::itsmft::TrkClusRef& trackletRef, gsl::span<const int> clusterRefs, int clusterOrdinal) const | ||
| { | ||
| const auto clusterEntry = trackletRef.getFirstEntry() + clusterOrdinal; | ||
| const auto clusterIndex = clusterRefs[clusterEntry]; | ||
| if (!hasITSClustersPerLayer()) { | ||
| return {-1, clusterIndex}; | ||
| } | ||
| return {getClusterLayer(trackletRef.pattern, clusterOrdinal, false), clusterIndex}; | ||
| } | ||
| template <typename TrackSpan> | ||
| std::vector<int> makeFlatITSTrackClusterRefs(TrackSpan tracks, gsl::span<const int> clusterRefs, const std::array<int, NITSLayers>& layerOffsets) const | ||
| { | ||
| if (!hasITSClustersPerLayer()) { | ||
| return {}; | ||
| } | ||
| std::vector<int> flatRefs(clusterRefs.size()); | ||
| for (const auto& track : tracks) { | ||
| for (int iCluster = 0; iCluster < track.getNumberOfClusters(); ++iCluster) { | ||
| const auto ref = getITSClusterReference(track, clusterRefs, iCluster); | ||
| flatRefs[track.getClusterEntry(iCluster)] = layerOffsets[ref.layer] + ref.index; | ||
| } | ||
| } | ||
| return flatRefs; | ||
| } | ||
| template <typename TrackletRefSpan> | ||
| std::vector<int> makeFlatITSABClusterRefs(TrackletRefSpan trackletRefs, gsl::span<const int> clusterRefs, const std::array<int, NITSLayers>& layerOffsets) const | ||
| { | ||
| if (!hasITSClustersPerLayer()) { | ||
| return {}; | ||
| } | ||
| std::vector<int> flatRefs(clusterRefs.size()); |
Owner
Author
There was a problem hiding this comment.
See above. the cluster ref already provides the layer and index within the layer, no need in additional flat structure.
| @@ -77,6 +77,8 @@ class AlignableDetectorITS : public AlignableDetector | |||
| protected: | |||
| // | |||
| std::vector<ClusterD> mITSClustersArray; | |||
Owner
Author
There was a problem hiding this comment.
The code in the Align can be discarded. I am developing new MP code, at the moment in a separate git repo to minimise switches. Will take care of extending to staggered version later.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.