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/collisionHistManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#include <Framework/HistogramSpec.h>

#include <array>
#include <cstddef>
#include <cstdint>
#include <map>
#include <string>
#include <string_view>
Expand Down
1 change: 1 addition & 0 deletions PWGCF/Femto/Core/pairHistManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include <array>
#include <cmath>
#include <cstdint>
#include <map>
#include <set>
#include <string>
Expand Down
42 changes: 21 additions & 21 deletions PWGCF/Femto/Core/partitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,21 @@
(o2::aod::femtobase::stored::mass < selection.massMax)

// partition for phis and rhos, i.e. resonance that are their own antiparticle
#define MAKE_RESONANCE_0_PARTITON(selection) \
(o2::aod::femtobase::stored::pt > selection.ptMin) && \
(o2::aod::femtobase::stored::pt < selection.ptMax) && \
(o2::aod::femtobase::stored::eta > selection.etaMin) && \
(o2::aod::femtobase::stored::eta < selection.etaMax) && \
(o2::aod::femtobase::stored::phi > selection.phiMin) && \
(o2::aod::femtobase::stored::phi < selection.phiMax) && \
(o2::aod::femtobase::stored::mass > selection.massMin) && \
(o2::aod::femtobase::stored::mass < selection.massMax) && \
ifnode(ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauBitForThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauMaskBelowThres)) && \
ifnode(ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauBitForThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauMaskBelowThres))
#define MAKE_RESONANCE_0_PARTITON(selection) \
(o2::aod::femtobase::stored::pt > selection.ptMin) && \
(o2::aod::femtobase::stored::pt < selection.ptMax) && \
(o2::aod::femtobase::stored::eta > selection.etaMin) && \
(o2::aod::femtobase::stored::eta < selection.etaMax) && \
(o2::aod::femtobase::stored::phi > selection.phiMin) && \
(o2::aod::femtobase::stored::phi < selection.phiMax) && \
(o2::aod::femtobase::stored::mass > selection.massMin) && \
(o2::aod::femtobase::stored::mass < selection.massMax) && \
ifnode(o2::aod::femtotwotrackresonances::posDauHasHighMomentum, \
ncheckbit(o2::aod::femtotwotrackresonances::maskPosDau, selection.posDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::maskPosDau, selection.posDauMaskBelowThres)) && \
ifnode(o2::aod::femtotwotrackresonances::negDauHasHighMomentum, \
ncheckbit(o2::aod::femtotwotrackresonances::maskNegDau, selection.negDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::maskNegDau, selection.negDauMaskBelowThres))

// partition for kstars, they have distinct antiparticle
#define MAKE_RESONANCE_1_PARTITON(selection) \
Expand All @@ -79,12 +79,12 @@
(o2::aod::femtobase::stored::phi < selection.phiMax) && \
(o2::aod::femtobase::stored::mass > selection.massMin) && \
(o2::aod::femtobase::stored::mass < selection.massMax) && \
ifnode(ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauBitForThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.posDauMaskBelowThres)) && \
ifnode(ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauBitForThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::mask, selection.negDauMaskBelowThres))
ifnode(o2::aod::femtotwotrackresonances::posDauHasHighMomentum, \
ncheckbit(o2::aod::femtotwotrackresonances::maskPosDau, selection.posDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::maskPosDau, selection.posDauMaskBelowThres)) && \
ifnode(o2::aod::femtotwotrackresonances::negDauHasHighMomentum, \
ncheckbit(o2::aod::femtotwotrackresonances::maskNegDau, selection.negDauMaskAboveThres), \
ncheckbit(o2::aod::femtotwotrackresonances::maskNegDau, selection.negDauMaskBelowThres))

// partition for lambdas
#define MAKE_LAMBDA_PARTITION(selection) \
Expand Down
11 changes: 11 additions & 0 deletions PWGCF/Femto/Core/trackBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,22 @@ constexpr const char PrefixTrackSelection1[] = "TrackSelection1";
constexpr const char PrefixTrackSelection2[] = "TrackSelection2";
constexpr const char PrefixTrackSelection3[] = "TrackSelection3";

// for resonances builder
constexpr const char PrefixPionPlus[] = "PionPlusSelection";
constexpr const char PrefixPionMinus[] = "PionMinusSelection";
constexpr const char PrefixKaonPlus[] = "KaonPlusSelection";
constexpr const char PrefixKaonMinus[] = "KaonMinusSelection";

// Instantiate different instances with unique prefixes
using ConfTrackSelection1 = ConfTrackSelection<PrefixTrackSelection1>;
using ConfTrackSelection2 = ConfTrackSelection<PrefixTrackSelection2>;
using ConfTrackSelection3 = ConfTrackSelection<PrefixTrackSelection3>;

using ConfPionPlusSelection = ConfTrackSelection<PrefixPionPlus>;
using ConfPionMinusSelection = ConfTrackSelection<PrefixPionMinus>;
using ConfKaonPlusSelection = ConfTrackSelection<PrefixKaonPlus>;
using ConfKaonMinusSelection = ConfTrackSelection<PrefixKaonMinus>;

/// enum for all track selections
enum TrackSels {
// track quality cuts
Expand Down
17 changes: 13 additions & 4 deletions PWGCF/Femto/Core/trackHistManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,26 +155,35 @@ struct ConfTrackBinning : o2::framework::ConfigurableGroup {
constexpr const char PrefixTrackBinning1[] = "TrackBinning1";
constexpr const char PrefixTrackBinning2[] = "TrackBinning2";
constexpr const char PrefixTrackBinning3[] = "TrackBinning3";
constexpr const char PrefixResonancePosDauBinning[] = "ResonancePosDauBinning";
constexpr const char PrefixResonanceNegDauBinning[] = "ResonanceNegDauBinning";
constexpr const char PrefixV0PosDauBinning[] = "V0PosDauBinning";
constexpr const char PrefixV0NegDauBinning[] = "V0NegDauBinning";
constexpr const char PrefixCascadePosDauBinning[] = "CascadePosDauBinning";
constexpr const char PrefixCascadeNegDauBinning[] = "CascadeNegDauBinning";
constexpr const char PrefixCascadeBachelorBinning[] = "CascadeBachelorBinning";
constexpr const char PrefixKinkChaDauBinning[] = "KinkChaDauBinning";
constexpr const char PrefixResonancePosDauBinning[] = "ResonancePosDauBinning";
constexpr const char PrefixResonanceNegDauBinning[] = "ResonanceNegDauBinning";
constexpr const char PrefixPionPlusBinning[] = "PionPlusBinning";
constexpr const char PrefixPionMinusBinning[] = "PionMinusBinning";
constexpr const char PrefixKaonPlusBinning[] = "KaonPlusBinning";
constexpr const char PrefixKaonMinusBinning[] = "KaonMinusBinning";

using ConfTrackBinning1 = ConfTrackBinning<PrefixTrackBinning1>;
using ConfTrackBinning2 = ConfTrackBinning<PrefixTrackBinning2>;
using ConfTrackBinning3 = ConfTrackBinning<PrefixTrackBinning3>;
using ConfResonancePosDauBinning = ConfTrackBinning<PrefixResonancePosDauBinning>;
using ConfResonanceNegDauBinning = ConfTrackBinning<PrefixResonanceNegDauBinning>;
using ConfV0PosDauBinning = ConfTrackBinning<PrefixV0PosDauBinning>;
using ConfV0NegDauBinning = ConfTrackBinning<PrefixV0NegDauBinning>;
using ConfCascadePosDauBinning = ConfTrackBinning<PrefixCascadePosDauBinning>;
using ConfCascadeNegDauBinning = ConfTrackBinning<PrefixCascadeNegDauBinning>;
using ConfCascadeBachelorBinning = ConfTrackBinning<PrefixCascadeBachelorBinning>;
using ConfKinkChaDauBinning = ConfTrackBinning<PrefixKinkChaDauBinning>;
// for resonance daughters
using ConfResonancePosDauBinning = ConfTrackBinning<PrefixResonancePosDauBinning>;
using ConfResonanceNegDauBinning = ConfTrackBinning<PrefixResonanceNegDauBinning>;
using ConfPionPlusBinning = ConfTrackBinning<PrefixPionPlusBinning>;
using ConfPionMinusBinning = ConfTrackBinning<PrefixPionPlusBinning>;
using ConfKaonPlusBinning = ConfTrackBinning<PrefixKaonPlusBinning>;
using ConfKaonMinusBinning = ConfTrackBinning<PrefixKaonPlusBinning>;

template <const char* Prefix>
struct ConfTrackQaBinning : o2::framework::ConfigurableGroup {
Expand Down
Loading
Loading