Skip to content

Commit 439c52a

Browse files
committed
fixup! [O2-7038] DPL Analysis: correction for tpcNClsFindable overflow
1 parent f4adf68 commit 439c52a

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,12 @@ DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsPID, tpcNClsPID, //! Number of found TPC clust
438438
[](uint8_t tpcNClsFindable, int8_t tpcNClsFindableMinusPID, int8_t tpcNClsFindableMinusFound) -> int16_t {
439439
return fixTPCNClsFindable(tpcNClsFindable, tpcNClsFindableMinusFound) - tpcNClsFindableMinusPID;
440440
});
441-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, //! Number of crossed TPC Rows
441+
DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsCrossedRows_fix, tpcNClsCrossedRows, //! Number of crossed TPC Rows
442442
[](uint8_t tpcNClsFindable, int8_t TPCNClsFindableMinusCrossedRows, int8_t tpcNClsFindableMinusFound) -> int16_t {
443443
return fixTPCNClsFindable(tpcNClsFindable, tpcNClsFindableMinusFound) - TPCNClsFindableMinusCrossedRows;
444444
});
445+
DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, //! Number of crossed TPC Rows
446+
[](uint8_t tpcNClsFindable, int8_t TPCNClsFindableMinusCrossedRows) -> int16_t { return (int16_t)tpcNClsFindable - TPCNClsFindableMinusCrossedRows; });
445447
DECLARE_SOA_DYNAMIC_COLUMN(ITSNCls, itsNCls, //! Number of ITS clusters
446448
[](uint8_t itsClusterMap) -> uint8_t {
447449
uint8_t itsNcls = 0;
@@ -601,7 +603,7 @@ DECLARE_SOA_TABLE_FULL(StoredTracksExtra_000, "TracksExtra", "AOD", "TRACKEXTRA"
601603
track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>,
602604
track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
603605
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
604-
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
606+
track::TPCNClsCrossedRows_fix<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
605607
track::TOFExpTimeEl<track::Length, track::TOFExpMom>,
606608
track::TOFExpTimeMu<track::Length, track::TOFExpMom>,
607609
track::TOFExpTimePi<track::Length, track::TOFExpMom>,
@@ -629,7 +631,7 @@ DECLARE_SOA_TABLE_FULL_VERSIONED(StoredTracksExtra_001, "TracksExtra", "AOD", "T
629631
track::HasITS<track::v001::DetectorMap>, track::HasTPC<track::v001::DetectorMap>,
630632
track::HasTRD<track::v001::DetectorMap>, track::HasTOF<track::v001::DetectorMap>,
631633
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
632-
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
634+
track::TPCNClsCrossedRows_fix<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
633635
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
634636
track::v001::ITSClsSizeInLayer<track::ITSClusterSizes>,
635637
track::v001::IsITSAfterburner<track::v001::DetectorMap, track::ITSChi2NCl>,
@@ -660,7 +662,7 @@ DECLARE_SOA_TABLE_FULL_VERSIONED(StoredTracksExtra_002, "TracksExtra", "AOD", "T
660662
track::HasTRD<track::v001::DetectorMap>, track::HasTOF<track::v001::DetectorMap>,
661663
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
662664
track::TPCNClsPID<track::TPCNClsFindable, track::TPCNClsFindableMinusPID, track::TPCNClsFindableMinusFound>,
663-
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
665+
track::TPCNClsCrossedRows_fix<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsFindableMinusFound>,
664666
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
665667
track::v001::ITSClsSizeInLayer<track::ITSClusterSizes>,
666668
track::v001::IsITSAfterburner<track::v001::DetectorMap, track::ITSChi2NCl>,

0 commit comments

Comments
 (0)