Skip to content

Please consider the following formatting changes to #18677 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yakparo merged 1 commit into from
Nov 10, 2026
Merged

Please consider the following formatting changes to #18677 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion PWGCF/Femto/Core/closeTripletRejection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ class CloseTripletRejectionTrackTrackSigma0
bool isClose12 = mCtrTrack12.isClosePair(track1, track2, trackTable, tripletHistManager);
bool isClose1Sigma0 = mCtrTrack1Sigma0.isClosePair(track1, sigma0, trackTable, tripletHistManager);
bool isClose2Sigma0 = mCtrTrack2Sigma0.isClosePair(track2, sigma0, trackTable, tripletHistManager);
return isClose12 || isClose1Sigma0|| isClose2Sigma0;
return isClose12 || isClose1Sigma0 || isClose2Sigma0;
}

private:
Expand Down
54 changes: 27 additions & 27 deletions PWGCF/Femto/Core/sigma0HistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

#include "PWGCF/Femto/Core/histManager.h"
#include "PWGCF/Femto/Core/modes.h"
#include "PWGCF/Femto/Core/photonHistManager.h"
#include "PWGCF/Femto/Core/trackHistManager.h"
#include "PWGCF/Femto/Core/v0HistManager.h"
#include "PWGCF/Femto/Core/photonHistManager.h"

#include <CommonConstants/MathConstants.h>
#include <Framework/Configurable.h>
Expand Down Expand Up @@ -158,29 +158,29 @@ constexpr std::array<histmanager::HistInfo<Sigma0Hist>, kSigma0HistLast> HistTab
{kTruePtVsPt, {(conf).pt, (conf).pt}}, \
{kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \
{kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \
{kPdg, {(conf).pdgCodes}},
{kPdg, {(conf).pdgCodes}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \
{kCosPa, {(confQa).cosPa}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
{kMassSigma0, {(confQa).massSigma0}}, \
{kMassAntiSigma0, {(confQa).massAntiSigma0}}, \
{kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \
{kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \
#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \
{kCosPa, {(confQa).cosPa}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
{kMassSigma0, {(confQa).massSigma0}}, \
{kMassAntiSigma0, {(confQa).massAntiSigma0}}, \
{kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \
{kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \
{kSigma0MassVsAntiSigma0Mass, {(confQa).massSigma0, (confQa).massAntiSigma0}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}},
#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}},

template <typename T>
auto makeSigma0HistSpecMap(const T& confBinningAnalysis)
Expand Down Expand Up @@ -237,7 +237,7 @@ class Sigma0HistManager
Sigma0HistManager() = default;
~Sigma0HistManager() = default;

// minimal init
// minimal init
template <modes::Mode mode, typename T1>
void init(o2::framework::HistogramRegistry* registry,
std::map<Sigma0Hist, std::vector<o2::framework::AxisSpec>> const& Sigma0Specs,
Expand Down Expand Up @@ -273,7 +273,7 @@ class Sigma0HistManager
this->initQa(Sigma0Specs);
}
}

// init with qa + lambda and photon managers
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4>
void init(o2::framework::HistogramRegistry* registry,
Expand All @@ -296,18 +296,18 @@ class Sigma0HistManager
void fill(T1 const& sigma0candidate)
{
if constexpr (modes::isFlagSet(mode, modes::Mode::kReco)) {
this->fillAnalysis(sigma0candidate);
}
this->fillAnalysis(sigma0candidate);
}
if constexpr (modes::isFlagSet(mode, modes::Mode::kQa)) {
this->fillQa(sigma0candidate);
this->fillQa(sigma0candidate);
}
}

// wrapper for tripletProcessHelpers
// wrapper for tripletProcessHelpers
template <modes::Mode mode, typename T1, typename T2>
void fill(T1 const& sigma0candidate, T2 const& tracks)
{
this->fillAnalysis(sigma0candidate);
this->fillAnalysis(sigma0candidate);
}

// fill sigma0 + lambda + photon
Expand All @@ -333,7 +333,7 @@ class Sigma0HistManager
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
void fill(T1 const& sigma0candidate, T2 const& trackTable, T3 const& col, T4 const& mcParticles, T5 const& mcMothers, T6 const& mcPartonicMothers)
{
this->template fillMc<mode>(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers);
this->template fillMc<mode>(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers);
}
// fill mc + lambda + photon
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
Expand Down
3 changes: 1 addition & 2 deletions PWGCF/Femto/Core/tripletBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
#include "PWGCF/Femto/Core/modes.h"
#include "PWGCF/Femto/Core/pairHistManager.h"
#include "PWGCF/Femto/Core/particleCleaner.h"
#include "PWGCF/Femto/Core/sigma0HistManager.h"
#include "PWGCF/Femto/Core/trackHistManager.h"
#include "PWGCF/Femto/Core/tripletCleaner.h"
#include "PWGCF/Femto/Core/tripletHistManager.h"
#include "PWGCF/Femto/Core/tripletProcessHelpers.h"
#include "PWGCF/Femto/Core/v0HistManager.h"
#include "PWGCF/Femto/Core/sigma0HistManager.h"
#include "PWGCF/Femto/DataModel/FemtoTables.h"

#include <Framework/HistogramRegistry.h>
Expand Down Expand Up @@ -1284,7 +1284,6 @@ class TripletTrackTrackSigma0Builder
std::uniform_int_distribution<> mDist;
};


// builder for triplets of generated particles (mc truth only, kMc without kReco)
// covers all triplet types, since e.g. a lambda is just another mc particle
template <auto& prefixMcParticle1,
Expand Down
28 changes: 14 additions & 14 deletions PWGCF/Femto/DataModel/FemtoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,8 @@ using StoredFSigmaPlusPcmExtras = StoredFSigmaPlusPcmExtras_001;
namespace femtosigma0s
{
DECLARE_SOA_COLUMN(Mask, mask, o2::analysis::femto::datatypes::Sigma0MaskType); //! Bitmask for track selections
DECLARE_SOA_INDEX_COLUMN_FULL(Lambda, lambda, int32_t, FLambdas, "_lambda"); ///< row in FLambdas
DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FPhotons, "_photon"); ///< row in FPhotons
DECLARE_SOA_INDEX_COLUMN_FULL(Lambda, lambda, int32_t, FLambdas, "_lambda"); ///< row in FLambdas
DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FPhotons, "_photon"); ///< row in FPhotons
// id columns for Lambda daughter tracks
DECLARE_SOA_INDEX_COLUMN_FULL(PosDau, posDau, int32_t, FTracks, "_PosDau"); //! index column for positive daughter track
DECLARE_SOA_INDEX_COLUMN_FULL(NegDau, negDau, int32_t, FTracks, "_NegDau"); //! index column for negative daughter track
Expand Down Expand Up @@ -1378,18 +1378,18 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FLitePhotons, "_photon");

// Same collision index column as FLambdas/FPhotons, so Sigma0s can be sliced by femto collision
DECLARE_SOA_TABLE_STAGED_VERSIONED(FSigma0s_001, "FSIGMA0", 1,
o2::soa::Index<>,
femtobase::stored::FColId,
femtobase::stored::SignedPt,
femtobase::stored::Eta,
femtobase::stored::Phi,
femtobase::stored::Mass,
femtosigma0s::LambdaId,
femtosigma0s::PosDauId,
femtosigma0s::NegDauId,
femtosigma0s::PhotonId,
femtobase::dynamic::Pt<femtobase::stored::SignedPt>,
femtobase::dynamic::Sign<femtobase::stored::SignedPt>);
o2::soa::Index<>,
femtobase::stored::FColId,
femtobase::stored::SignedPt,
femtobase::stored::Eta,
femtobase::stored::Phi,
femtobase::stored::Mass,
femtosigma0s::LambdaId,
femtosigma0s::PosDauId,
femtosigma0s::NegDauId,
femtosigma0s::PhotonId,
femtobase::dynamic::Pt<femtobase::stored::SignedPt>,
femtobase::dynamic::Sign<femtobase::stored::SignedPt>);
using FSigma0s = FSigma0s_001;

DECLARE_SOA_TABLE_STAGED_VERSIONED(FSigma0Masks_001, "FSIGMA0MASK", 1, //! sigma0 masks
Expand Down
1 change: 0 additions & 1 deletion PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{adaptAnalysisTask<FemtoSigma0Producer>(cfgc)};
}

16 changes: 8 additions & 8 deletions PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
#include "PWGCF/Femto/Core/pairCleaner.h"
#include "PWGCF/Femto/Core/particleCleaner.h"
#include "PWGCF/Femto/Core/partitions.h"
#include "PWGCF/Femto/Core/photonHistManager.h"
#include "PWGCF/Femto/Core/sigma0Builder.h"
#include "PWGCF/Femto/Core/sigma0HistManager.h"
#include "PWGCF/Femto/Core/trackBuilder.h"
#include "PWGCF/Femto/Core/trackHistManager.h"
#include "PWGCF/Femto/Core/tripletBuilder.h"
#include "PWGCF/Femto/Core/tripletHistManager.h"
#include "PWGCF/Femto/Core/sigma0Builder.h"
#include "PWGCF/Femto/Core/sigma0HistManager.h"
#include "PWGCF/Femto/Core/v0HistManager.h"
#include "PWGCF/Femto/Core/photonHistManager.h"
#include "PWGCF/Femto/DataModel/FemtoTables.h"

#include <Framework/ASoA.h>
Expand All @@ -44,8 +44,8 @@
#include <Framework/runDataProcessing.h>

#include <map>
#include <vector>
#include <string>
#include <vector>

using namespace o2::analysis::femto;

Expand Down Expand Up @@ -80,8 +80,8 @@ struct FemtoTripletTrackTrackSigma0 {
trackhistmanager::ConfTrackBinning1 confTrackBinning1;
trackbuilder::ConfTrackSelection2 confTrackSelections2;
trackhistmanager::ConfTrackBinning2 confTrackBinning2;
inline static constexpr std::string_view PrefixTrack1 = "Track1/";
inline static constexpr std::string_view PrefixTrack2 = "Track2/";
inline static constexpr std::string_view PrefixTrack1 = "Track1/";
inline static constexpr std::string_view PrefixTrack2 = "Track2/";

// particle cleaners (mc only)
particlecleaner::ConfTrackCleaner1 confTrackCleaner1;
Expand All @@ -98,9 +98,9 @@ struct FemtoTripletTrackTrackSigma0 {

// setup for photon and lambda
v0histmanager::ConfLambdaBinning1 confLambdaBinning;
inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/";
inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/";
photonhistmanager::ConfPhotonBinning confPhotonBinning;
inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/";
inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/";

// setup sigma0s
sigma0builder::ConfSigma0SelectionDefault confSigma0Selection;
Expand Down
Loading