Skip to content

Commit 8ecdfb5

Browse files
committed
Get rid of intermediated matchCand containers + various improvements
1 parent 9f06cd0 commit 8ecdfb5

12 files changed

Lines changed: 1327 additions & 276 deletions

File tree

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/Cluster.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ class Cluster : public o2::BaseCluster<float>
6363

6464
~Cluster() = default;
6565

66-
Cluster& operator=(const Cluster& cluster) = delete; // RS why?
67-
6866
//****** Basic methods ******************
6967
void setUsed() { setBit(kUsed); }
7068
void setShared() { setBit(kShared); }

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/CompCluster.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class CompClusterExt : public CompCluster
102102
}
103103

104104
UShort_t getChipID() const { return mChipID; }
105+
UShort_t getSensorID() const { return mChipID; } // to have the same signature as BaseCluster
105106

106107
void setChipID(UShort_t c) { mChipID = c; }
107108

DataFormats/common/include/CommonDataFormat/InteractionRecord.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ struct InteractionRecord {
5959
bc = ns2bc(ns, orbit);
6060
}
6161

62+
double bc2ns() const { return bc2ns(bc, orbit); }
63+
6264
static double bc2ns(int bc, unsigned int orbit)
6365
{
6466
return bc * o2::constants::lhc::LHCBunchSpacingNS + orbit * o2::constants::lhc::LHCOrbitNS;

Detectors/GlobalTracking/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ o2_add_library(GlobalTracking
1616
O2::DataFormatsITS
1717
O2::DataFormatsFT0
1818
O2::DataFormatsTOF
19+
O2::ITSReconstruction
1920
O2::TPCFastTransformation
2021
O2::GPUTracking
2122
O2::TPCBase

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h

Lines changed: 148 additions & 124 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)