@@ -410,62 +410,21 @@ DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool); //! is ambiguous
410410DECLARE_SOA_COLUMN (Sign, sign, int8_t ); // !
411411DECLARE_SOA_COLUMN (PrefilterBit, pfb, uint8_t ); // !
412412DECLARE_SOA_COLUMN (PrefilterBitDerived, pfbderived, uint16_t ); // !
413+ DECLARE_SOA_COLUMN (ProbElBDT, probElBDT, float ); // !
413414
414415DECLARE_SOA_COLUMN (ITSNSigmaEl, itsNSigmaEl, float ); // !
415416DECLARE_SOA_COLUMN (ITSNSigmaMu, itsNSigmaMu, float ); // !
416417DECLARE_SOA_COLUMN (ITSNSigmaPi, itsNSigmaPi, float ); // !
417418DECLARE_SOA_COLUMN (ITSNSigmaKa, itsNSigmaKa, float ); // !
418419DECLARE_SOA_COLUMN (ITSNSigmaPr, itsNSigmaPr, float ); // !
419420
420- DECLARE_SOA_COLUMN (TPCSignalUINT16, tpcSignalUINT16, uint16_t ); // ! 0 - +65535
421- DECLARE_SOA_COLUMN (DeDxTunedMcUINT16, mcTunedTPCSignalUINT16, uint16_t ); // ! 0 - +65535
422- DECLARE_SOA_COLUMN (ProbElBDT, probElBDT, float ); // !
423- // DECLARE_SOA_COLUMN(ProbEbdtUINT16, probEbdtUINT16, uint16_t); //! 0 - +65535
424-
425- DECLARE_SOA_COLUMN (TPCChi2NClINT16, tpcChi2NClINT16, int16_t ); // ! -32768 - +32767
426- DECLARE_SOA_COLUMN (ITSChi2NClINT16, itsChi2NClINT16, int16_t ); // ! -32768 - +32767
427-
428- DECLARE_SOA_COLUMN (BetaINT16, betaINT16, int16_t ); // ! -32768 - +32767
429- DECLARE_SOA_COLUMN (TOFChi2INT16, tofChi2INT16, int16_t ); // ! -32768 - +32767
430-
431- DECLARE_SOA_COLUMN (TPCNSigmaElINT16, tpcNSigmaElINT16, int16_t ); // ! -32768 - +32767
432- DECLARE_SOA_COLUMN (TPCNSigmaMuINT16, tpcNSigmaMuINT16, int16_t ); // ! -32768 - +32767
433- DECLARE_SOA_COLUMN (TPCNSigmaPiINT16, tpcNSigmaPiINT16, int16_t ); // ! -32768 - +32767
434- DECLARE_SOA_COLUMN (TPCNSigmaKaINT16, tpcNSigmaKaINT16, int16_t ); // ! -32768 - +32767
435- DECLARE_SOA_COLUMN (TPCNSigmaPrINT16, tpcNSigmaPrINT16, int16_t ); // ! -32768 - +32767
436-
437- DECLARE_SOA_COLUMN (TOFNSigmaElINT16, tofNSigmaElINT16, int16_t ); // ! -32768 - +32767
438- DECLARE_SOA_COLUMN (TOFNSigmaMuINT16, tofNSigmaMuINT16, int16_t ); // ! -32768 - +32767
439- DECLARE_SOA_COLUMN (TOFNSigmaPiINT16, tofNSigmaPiINT16, int16_t ); // ! -32768 - +32767
440- DECLARE_SOA_COLUMN (TOFNSigmaKaINT16, tofNSigmaKaINT16, int16_t ); // ! -32768 - +32767
441- DECLARE_SOA_COLUMN (TOFNSigmaPrINT16, tofNSigmaPrINT16, int16_t ); // ! -32768 - +32767
442-
443- DECLARE_SOA_DYNAMIC_COLUMN (TPCSignal, tpcSignal, [](uint16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
444- DECLARE_SOA_DYNAMIC_COLUMN (DeDxTunedMc, mcTunedTPCSignal, [](uint16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
445- // DECLARE_SOA_DYNAMIC_COLUMN(ProbEbdt, probEbdt, [](uint16_t x) -> float { return static_cast<float>(x) * 1e-4; });
446- DECLARE_SOA_DYNAMIC_COLUMN (TPCChi2NCl, tpcChi2NCl, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
447- DECLARE_SOA_DYNAMIC_COLUMN (ITSChi2NCl, itsChi2NCl, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
448- DECLARE_SOA_DYNAMIC_COLUMN (Beta, beta, [](int16_t x) -> float { return static_cast <float >(x) * 1e-3 ; });
449- DECLARE_SOA_DYNAMIC_COLUMN (TOFChi2, tofChi2, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
450-
451- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaEl, tpcNSigmaEl, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
452- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaMu, tpcNSigmaMu, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
453- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaPi, tpcNSigmaPi, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
454- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaKa, tpcNSigmaKa, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
455- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaPr, tpcNSigmaPr, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
456-
457- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaEl, tofNSigmaEl, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
458- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaMu, tofNSigmaMu, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
459- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaPi, tofNSigmaPi, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
460- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaKa, tofNSigmaKa, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
461- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaPr, tofNSigmaPr, [](int16_t x) -> float { return static_cast <float >(x) * 1e-2 ; });
462-
463421DECLARE_SOA_DYNAMIC_COLUMN (Signed1Pt, signed1Pt, [](float pt, int8_t sign) -> float { return sign * 1 . / pt; });
464422DECLARE_SOA_DYNAMIC_COLUMN (P, p, [](float pt, float eta) -> float { return pt * std::cosh (eta); });
465423DECLARE_SOA_DYNAMIC_COLUMN (Px, px, [](float pt, float phi) -> float { return pt * std::cos (phi); });
466424DECLARE_SOA_DYNAMIC_COLUMN (Py, py, [](float pt, float phi) -> float { return pt * std::sin (phi); });
467425DECLARE_SOA_DYNAMIC_COLUMN (Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh (eta); });
468426DECLARE_SOA_DYNAMIC_COLUMN (Theta, theta, [](float tgl) -> float { return M_PI_2 - std::atan (tgl); });
427+ DECLARE_SOA_DYNAMIC_COLUMN (Tgl, tgl, [](float eta) -> float { return std::tan (M_PI_2 - 2 * std::atan (std::exp (-eta))); });
469428DECLARE_SOA_DYNAMIC_COLUMN (MeanClusterSizeITS, meanClusterSizeITS, [](uint32_t itsClusterSizes) -> float {
470429 int total_cluster_size = 0 , nl = 0 ;
471430 for (unsigned int layer = 0 ; layer < 7 ; layer++) {
@@ -610,14 +569,12 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_004, "AOD", "EMPRIMARYEL", 4, //!
610569 track::Pt, track::Eta, track::Phi,
611570 track::DcaXY, track::DcaZ, aod::track::CYY, aod::track::CZY, aod::track::CZZ,
612571 track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
613- emprimaryelectron::TPCChi2NClINT16, track::TPCInnerParam,
614- emprimaryelectron::TPCSignalUINT16, emprimaryelectron::TPCNSigmaElINT16, emprimaryelectron::TPCNSigmaPiINT16, emprimaryelectron::TPCNSigmaKaINT16, emprimaryelectron::TPCNSigmaPrINT16,
615- emprimaryelectron::BetaINT16, emprimaryelectron::TOFNSigmaElINT16, emprimaryelectron::TOFNSigmaPiINT16, emprimaryelectron::TOFNSigmaKaINT16, emprimaryelectron::TOFNSigmaPrINT16,
616- track::ITSClusterSizes,
617- emprimaryelectron::ITSChi2NClINT16, emprimaryelectron::TOFChi2INT16, track::DetectorMap,
618- track::Tgl,
572+ track::TPCChi2NCl, track::TPCInnerParam,
573+ track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
574+ pidtofbeta::Beta, pidtof::TOFNSigmaEl, /* pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,*/
575+ track::ITSClusterSizes, track::ITSChi2NCl, track::TOFChi2, track::DetectorMap, /* track::Tgl,*/
619576 emprimaryelectron::IsAssociatedToMPC, emprimaryelectron::IsAmbiguous, emprimaryelectron::ProbElBDT,
620- emprimaryelectron::DeDxTunedMcUINT16 ,
577+ mcpidtpc::DeDxTunedMc ,
621578
622579 // dynamic column
623580 track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
@@ -628,31 +585,12 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_004, "AOD", "EMPRIMARYEL", 4, //!
628585 track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
629586 track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
630587
631- emprimaryelectron::TPCSignal<emprimaryelectron::TPCSignalUINT16>,
632- emprimaryelectron::TPCChi2NCl<emprimaryelectron::TPCChi2NClINT16>,
633- emprimaryelectron::ITSChi2NCl<emprimaryelectron::ITSChi2NClINT16>,
634- emprimaryelectron::DeDxTunedMc<emprimaryelectron::DeDxTunedMcUINT16>,
635- // emprimaryelectron::ProbEbdt<emprimaryelectron::ProbEbdtUINT16>,
636- emprimaryelectron::Beta<emprimaryelectron::BetaINT16>,
637- emprimaryelectron::TOFChi2<emprimaryelectron::TOFChi2INT16>,
638-
639- emprimaryelectron::TPCNSigmaEl<emprimaryelectron::TPCNSigmaElINT16>,
640- emprimaryelectron::TPCNSigmaMu<emprimaryelectron::TPCNSigmaMuINT16>,
641- emprimaryelectron::TPCNSigmaPi<emprimaryelectron::TPCNSigmaPiINT16>,
642- emprimaryelectron::TPCNSigmaKa<emprimaryelectron::TPCNSigmaKaINT16>,
643- emprimaryelectron::TPCNSigmaPr<emprimaryelectron::TPCNSigmaPrINT16>,
644- emprimaryelectron::TOFNSigmaEl<emprimaryelectron::TOFNSigmaElINT16>,
645- emprimaryelectron::TOFNSigmaMu<emprimaryelectron::TOFNSigmaMuINT16>,
646- emprimaryelectron::TOFNSigmaPi<emprimaryelectron::TOFNSigmaPiINT16>,
647- emprimaryelectron::TOFNSigmaKa<emprimaryelectron::TOFNSigmaKaINT16>,
648- emprimaryelectron::TOFNSigmaPr<emprimaryelectron::TOFNSigmaPrINT16>,
649-
650588 emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
651589 emprimaryelectron::P<track::Pt, track::Eta>,
652590 emprimaryelectron::Px<track::Pt, track::Phi>,
653591 emprimaryelectron::Py<track::Pt, track::Phi>,
654592 emprimaryelectron::Pz<track::Pt, track::Eta>,
655- emprimaryelectron::Theta <track::Tgl >,
593+ emprimaryelectron::Tgl <track::Eta >,
656594 emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
657595 emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
658596 emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
0 commit comments