Skip to content

Commit 940ab37

Browse files
authored
[PWGEM/Dilepton] add ITS PID in data table (#9257)
1 parent fcec500 commit 940ab37

File tree

7 files changed

+96
-59
lines changed

7 files changed

+96
-59
lines changed

PWGEM/Dilepton/DataModel/dileptonTables.h

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@ DECLARE_SOA_COLUMN(IsAssociatedToMPC, isAssociatedToMPC, bool); //! is associate
371371
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //!
372372
DECLARE_SOA_COLUMN(PrefilterBit, pfb, uint8_t); //!
373373
DECLARE_SOA_COLUMN(PrefilterBitDerived, pfbderived, uint16_t); //!
374+
DECLARE_SOA_COLUMN(ITSNSigmaEl, itsNSigmaEl, float); //!
375+
DECLARE_SOA_COLUMN(ITSNSigmaMu, itsNSigmamu, float); //!
376+
DECLARE_SOA_COLUMN(ITSNSigmaPi, itsNSigmaPi, float); //!
377+
DECLARE_SOA_COLUMN(ITSNSigmaKa, itsNSigmaKa, float); //!
378+
DECLARE_SOA_COLUMN(ITSNSigmaPr, itsNSigmaPr, float); //!
374379
DECLARE_SOA_DYNAMIC_COLUMN(Signed1Pt, signed1Pt, [](float pt, int8_t sign) -> float { return sign * 1. / pt; });
375380
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * std::cosh(eta); });
376381
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) -> float { return pt * std::cos(phi); });
@@ -423,34 +428,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(MeanClusterSizeITSob, meanClusterSizeITSob, [](uint32
423428
}
424429
});
425430
} // namespace emprimaryelectron
426-
DECLARE_SOA_TABLE(EMPrimaryElectrons_000, "AOD", "EMPRIMARYEL", //!
427-
o2::soa::Index<>, emprimaryelectron::CollisionId,
428-
emprimaryelectron::TrackId, emprimaryelectron::Sign,
429-
track::Pt, track::Eta, track::Phi, track::DcaXY, track::DcaZ,
430-
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
431-
track::TPCChi2NCl, track::TPCInnerParam,
432-
track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaMu, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
433-
pidtofbeta::Beta, pidtof::TOFNSigmaEl, pidtof::TOFNSigmaMu, pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,
434-
track::ITSClusterSizes, track::ITSChi2NCl, track::DetectorMap,
435-
track::X, track::Alpha, track::Y, track::Z, track::Snp, track::Tgl, emprimaryelectron::IsAssociatedToMPC,
436-
437-
// dynamic column
438-
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
439-
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
440-
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
441-
track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
442-
track::TPCFractionSharedCls<track::TPCNClsShared, track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
443-
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
444-
track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
445-
emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
446-
emprimaryelectron::P<track::Pt, track::Eta>,
447-
emprimaryelectron::Px<track::Pt, track::Phi>,
448-
emprimaryelectron::Py<track::Pt, track::Phi>,
449-
emprimaryelectron::Pz<track::Pt, track::Eta>,
450-
emprimaryelectron::Theta<track::Tgl>,
451-
emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
452-
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
453-
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
454431

455432
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_001, "AOD", "EMPRIMARYEL", 1, //!
456433
o2::soa::Index<>, emprimaryelectron::CollisionId,
@@ -481,7 +458,37 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_001, "AOD", "EMPRIMARYEL", 1, //!
481458
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
482459
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
483460

484-
using EMPrimaryElectrons = EMPrimaryElectrons_001;
461+
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_002, "AOD", "EMPRIMARYEL", 2, //!
462+
o2::soa::Index<>, emprimaryelectron::CollisionId,
463+
emprimaryelectron::TrackId, emprimaryelectron::Sign,
464+
track::Pt, track::Eta, track::Phi, track::DcaXY, track::DcaZ,
465+
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
466+
track::TPCChi2NCl, track::TPCInnerParam,
467+
track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaMu, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
468+
pidtofbeta::Beta, pidtof::TOFNSigmaEl, pidtof::TOFNSigmaMu, pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,
469+
track::ITSClusterSizes, emprimaryelectron::ITSNSigmaEl, emprimaryelectron::ITSNSigmaMu, emprimaryelectron::ITSNSigmaPi, emprimaryelectron::ITSNSigmaKa, emprimaryelectron::ITSNSigmaPr,
470+
track::ITSChi2NCl, track::TOFChi2, track::DetectorMap,
471+
track::X, track::Alpha, track::Y, track::Z, track::Snp, track::Tgl, emprimaryelectron::IsAssociatedToMPC,
472+
473+
// dynamic column
474+
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
475+
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
476+
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
477+
track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
478+
track::TPCFractionSharedCls<track::TPCNClsShared, track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
479+
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
480+
track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
481+
emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
482+
emprimaryelectron::P<track::Pt, track::Eta>,
483+
emprimaryelectron::Px<track::Pt, track::Phi>,
484+
emprimaryelectron::Py<track::Pt, track::Phi>,
485+
emprimaryelectron::Pz<track::Pt, track::Eta>,
486+
emprimaryelectron::Theta<track::Tgl>,
487+
emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
488+
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
489+
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
490+
491+
using EMPrimaryElectrons = EMPrimaryElectrons_002;
485492
// iterators
486493
using EMPrimaryElectron = EMPrimaryElectrons::iterator;
487494

PWGEM/Dilepton/TableProducer/filterDielectronEvent.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ struct filterDielectronEvent {
334334
track.tpcChi2NCl(), track.tpcInnerParam(),
335335
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
336336
track.beta(), track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
337-
track.itsClusterSizes(), track.itsChi2NCl(), track.tofChi2(), track.detectorMap(),
337+
track.itsClusterSizes(), 0, 0, 0, 0, 0,
338+
track.itsChi2NCl(), track.tofChi2(), track.detectorMap(),
338339
track_par_cov_recalc.getX(), track_par_cov_recalc.getAlpha(), track_par_cov_recalc.getY(), track_par_cov_recalc.getZ(), track_par_cov_recalc.getSnp(), track_par_cov_recalc.getTgl(), isAssociatedToMPC);
339340

340341
emprimaryelectronscov(

0 commit comments

Comments
 (0)