Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions PWGCF/Femto/Core/femtoUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

#include <TPDGCode.h>

#include <sys/types.h>

#include <algorithm>
#include <cmath>
#include <concepts>
Expand Down
30 changes: 24 additions & 6 deletions PWGCF/Femto/DataModel/FemtoTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <CommonConstants/MathConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/Expressions.h>

#include <cmath>
#include <cstdint>
Expand Down Expand Up @@ -234,10 +233,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(SignedPt, signedPt,
[](uint16_t signedBinnedPt) -> float {
return unBinSignedPt(signedBinnedPt);
});
DECLARE_SOA_DYNAMIC_COLUMN(UnsignedPt, unsignedPt,
[](uint16_t unsignedBinnedPt) -> float {
return unBinUnsignedPt(unsignedBinnedPt);
});
DECLARE_SOA_DYNAMIC_COLUMN(Eta, eta,
[](uint16_t binnedEta) -> float {
return unBinEta(binnedEta);
Expand All @@ -246,6 +241,23 @@ DECLARE_SOA_DYNAMIC_COLUMN(Phi, phi,
[](uint16_t binnedPhi) -> float {
return unBinPhi(binnedPhi);
});

namespace signedpt
{
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,
[](uint16_t signedBinnedPt) -> float {
return std::fabs(unBinSignedPt(signedBinnedPt));
});
} // namespace signedpt

namespace unsignedpt
{
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,
[](uint16_t unsignedBinnedPt) -> float {
return unBinUnsignedPt(unsignedBinnedPt);
});
} // namespace unsignedpt

} // namespace lite
} // namespace femtobase

Expand Down Expand Up @@ -355,6 +367,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteTracks_001, "FLITETRACK", 1, //! femto t
femtobase::lite::BinnedPhi,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>);
using FLiteTracks = FLiteTracks_001;
Expand Down Expand Up @@ -628,6 +641,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteLambdas_001, "FLITELAMBDA", 1,
femtov0s::lite::NegDauId,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtov0s::lite::LambdaMass<femtov0s::lite::BinnedLambdaMass>);
Expand Down Expand Up @@ -681,7 +695,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteK0shorts_001, "FLITEK0SHORT", 1,
femtov0s::lite::BinnedK0shortMass,
femtov0s::lite::PosDauId,
femtov0s::lite::NegDauId,
femtobase::lite::UnsignedPt<femtobase::lite::UnsignedBinnedPt>,
femtobase::lite::unsignedpt::Pt<femtobase::lite::UnsignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtov0s::lite::K0shortMass<femtov0s::lite::BinnedK0shortMass>);
Expand Down Expand Up @@ -795,6 +809,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteSigmas_001, "FLITESIGMA", 1,
femtokinks::lite::ChaDauId,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtokinks::lite::SigmaMass<femtokinks::lite::BinnedSigmaMass>);
Expand Down Expand Up @@ -850,6 +865,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteSigmaPlus_001, "FLITESIGMAPLUS", 1,
femtokinks::lite::ChaDauId,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtokinks::lite::SigmaMass<femtokinks::lite::BinnedSigmaMass>);
Expand Down Expand Up @@ -963,6 +979,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteXis_001, "FLITEXI", 1,
femtov0s::lite::NegDauId,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtocascades::lite::XiMass<femtocascades::lite::BinnedXiMass>);
Expand Down Expand Up @@ -1021,6 +1038,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FLiteOmegas_001, "FLITEOMEGA", 1,
femtov0s::lite::NegDauId,
femtobase::lite::Sign<femtobase::lite::SignedBinnedPt>,
femtobase::lite::SignedPt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::signedpt::Pt<femtobase::lite::SignedBinnedPt>,
femtobase::lite::Eta<femtobase::lite::BinnedEta>,
femtobase::lite::Phi<femtobase::lite::BinnedPhi>,
femtocascades::lite::OmegaMass<femtocascades::lite::BinnedOmegaMass>);
Expand Down
3 changes: 2 additions & 1 deletion PWGCF/Femto/TableProducer/femtoProducerLiteConverter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>

Expand Down Expand Up @@ -70,7 +71,7 @@ struct FemtoProducerLiteConverter {
void processLiteK0shorts(o2::aod::FLiteK0shorts::iterator const& liteK0short)
{
producedK0shorts(liteK0short.fLiteColId(),
liteK0short.unsignedPt(),
liteK0short.pt(),
liteK0short.eta(),
liteK0short.phi(),
liteK0short.k0shortMass(),
Expand Down
Loading