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