Skip to content

Please consider the following formatting changes to #16486 #71

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
romainschotter merged 1 commit into from
Jun 1, 2026
Merged

Please consider the following formatting changes to #16486 #71

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
4 changes: 2 additions & 2 deletions PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/cascqaanalysis.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/TriggerAliases.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/TrackSelectionDefaults.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/TriggerAliases.h"

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/ASoAHelpers.h"
Expand Down Expand Up @@ -256,20 +256,20 @@
// Omega and antiOmega
int pdgCode{cascMC.pdgCode()};
if (!cfgcheckMCParticle || (std::abs(pdgCode) == kOmegaMinus && std::abs(cascMC.pdgCodeV0()) == kLambda0 && std::abs(cascMC.pdgCodeBachelor()) == kKPlus)) {
if (casc.sign() < 0 && (casc.mOmega() > 1.63) && (casc.mOmega() < 1.71) && std::fabs(casc.yOmega()) < cfgCasc_rapidity &&

Check failure on line 259 in PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
(!cfgcheckDauTPC || (std::fabs(bachelor.tpcNSigmaKa()) < cfgNSigma[2] && std::fabs(posdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(negdau.tpcNSigmaPi()) < cfgNSigma[0]))) {
registry.fill(HIST("h3DRecOmega"), casc.pt(), rectracknum, casc.mOmega());
} else if (casc.sign() > 0 && (casc.mOmega() > 1.63) && (casc.mOmega() < 1.71) && std::fabs(casc.yOmega()) < cfgCasc_rapidity &&

Check failure on line 262 in PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
(!cfgcheckDauTPC || (std::fabs(bachelor.tpcNSigmaKa()) < cfgNSigma[2] && std::fabs(negdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(posdau.tpcNSigmaPi()) < cfgNSigma[0]))) {
registry.fill(HIST("h3DRecOmega"), casc.pt(), rectracknum, casc.mOmega());
}
}
// Xi and antiXi
if (!cfgcheckMCParticle || (std::abs(pdgCode) == kXiMinus && std::abs(cascMC.pdgCodeV0()) == kLambda0 && std::abs(cascMC.pdgCodeBachelor()) == kPiPlus)) {
if (casc.sign() < 0 && (casc.mXi() > 1.30) && (casc.mXi() < 1.37) && std::fabs(casc.yXi()) < cfgCasc_rapidity &&

Check failure on line 269 in PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
(!cfgcheckDauTPC || (std::fabs(bachelor.tpcNSigmaPi()) < cfgNSigma[0] && std::fabs(posdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(negdau.tpcNSigmaPi()) < cfgNSigma[0]))) {
registry.fill(HIST("h3DRecXi"), casc.pt(), rectracknum, casc.mXi());
} else if (casc.sign() > 0 && (casc.mXi() > 1.30) && (casc.mXi() < 1.37) && std::fabs(casc.yXi()) < cfgCasc_rapidity &&

Check failure on line 272 in PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
(!cfgcheckDauTPC || (std::fabs(bachelor.tpcNSigmaPi()) < cfgNSigma[0] && std::fabs(negdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(posdau.tpcNSigmaPi()) < cfgNSigma[0]))) {
registry.fill(HIST("h3DRecXi"), casc.pt(), rectracknum, casc.mXi());
}
Expand Down Expand Up @@ -326,7 +326,7 @@
int pdgCode{v0MC.pdgCode()};
// K0short
if (!cfgcheckMCParticle || (std::abs(pdgCode) == kK0Short && v0MC.pdgCodePositive() == kPiPlus && v0MC.pdgCodeNegative() == kPiMinus)) {
if (v0.qtarm() / std::fabs(v0.alpha()) > cfgv0_ArmPodocut && std::fabs(v0.y()) < 0.5 && std::fabs(v0.mK0Short() - o2::constants::physics::MassK0Short) < cfgv0_mk0swindow &&

Check failure on line 329 in PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
(!cfgcheckDauTPC || (std::fabs(v0posdau.tpcNSigmaPi()) < cfgNSigma[0] && std::fabs(v0negdau.tpcNSigmaPi()) < cfgNSigma[0]))) {
registry.fill(HIST("h3DRecK0s"), v0.pt(), rectracknum, v0.mK0Short());
registry.fill(HIST("QAhisto/V0/hqaarm_podoafter"), v0.alpha(), v0.qtarm());
Expand Down
53 changes: 15 additions & 38 deletions PWGDQ/Tasks/quarkoniaToHyperons.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,6 @@
// david.dobrigkeit.chinellato@cern.ch
//

#include <Math/Vector4D.h>
#include <cmath>
#include <array>
#include <cstdlib>
#include <map>
#include <string>
#include <vector>

#include <TFile.h>
#include <TH2F.h>
#include <TProfile.h>
#include <TLorentzVector.h>
#include <TPDGCode.h>
#include "Math/Vector3D.h"

#include "DCAFitter/DCAFitterN.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "ReconstructionDataFormats/Track.h"
#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/PhysicsConstants.h"
#include "Common/Core/trackUtilities.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/LFStrangenessMLTables.h"
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
Expand All @@ -79,17 +49,23 @@

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/PhysicsConstants.h"
#include "DCAFitter/DCAFitterN.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/Track.h"

#include "Math/Vector3D.h"
#include <Math/Vector4D.h>
#include <TFile.h>
#include <TH2F.h>
#include <TLorentzVector.h>

Check failure on line 68 in PWGDQ/Tasks/quarkoniaToHyperons.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector] 

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
#include <TPDGCode.h>
#include <TProfile.h>

Expand All @@ -101,8 +77,8 @@
#include <vector>

// constants
const float ctauXiPDG = 4.91; // Xi PDG lifetime

Check failure on line 80 in PWGDQ/Tasks/quarkoniaToHyperons.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
const float ctauOmegaPDG = 2.461; // Omega PDG lifetime

Check failure on line 81 in PWGDQ/Tasks/quarkoniaToHyperons.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -389,7 +365,7 @@
ConfigurableAxis axisHypPairPhi{"axisHypPairPhi", {180, 0.0f, constants::math::TwoPI}, "Hyperon pair azimuthal angle (rad)"};
} axes;

o2::base::MatLayerCylSet* lut; // material LUT for DCA fitter
o2::base::MatLayerCylSet* lut; // material LUT for DCA fitter
o2::vertexing::DCAFitterN<2> fitter;

// helper object
Expand Down Expand Up @@ -815,8 +791,8 @@
histos.add("QA/XiXiBar/h3dMassXiXiBarVsDCAPair", "h3dMassXiXiBarVsDCAPair", kTH3F, {axes.axisDCAHypPair, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairCosPA", "h3dMassXiXiBarVsPairCosPA", kTH3F, {axes.axisHypPairCosPA, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairOpAngle", "h3dMassXiXiBarVsPairOpAngle", kTH3F, {axes.axisHypPairOpAngle, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairEta", "h3dMassXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairPhi", "h3dMassXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairEta", "h3dMassXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairPhi", "h3dMassXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisQuarkoniumMass});
histos.add("QA/LaLaBar/h3dDeltaEtaXiXiBarVsPairEta", "h3dDeltaEtaXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisHypPairEta});
histos.add("QA/LaLaBar/h3dDeltaPhiXiXiBarVsPairPhi", "h3dDeltaPhiXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisHypPairPhi});
}
Expand Down Expand Up @@ -970,7 +946,7 @@
if (ccdbConfigurations.useCustomMagField) {
magField = ccdbConfigurations.customMagField;
o2::parameters::GRPMagField grpmag;
if (fabs(magField) > 1e-5) {

Check failure on line 949 in PWGDQ/Tasks/quarkoniaToHyperons.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
grpmag.setL3Current(30000.f / (magField / 5.0f));
}
o2::base::Propagator::initFieldFromGRP(&grpmag);
Expand Down Expand Up @@ -1082,11 +1058,13 @@
std::array<float, 3> antiHyperonMomentum = {0.0f, 0.0f, 0.0f};
float DCADau = -999.f;
float CosPA = -1.f;
float OpAngle = -999.f;
float Eta() const {
float OpAngle = -999.f;
float Eta() const
{
return RecoDecay::eta(std::array{hyperonMomentum[0] + antiHyperonMomentum[0], hyperonMomentum[1] + antiHyperonMomentum[1], hyperonMomentum[2] + antiHyperonMomentum[2]});
}
float Phi() const {
float Phi() const
{
return RecoDecay::phi(std::array{hyperonMomentum[0] + antiHyperonMomentum[0], hyperonMomentum[1] + antiHyperonMomentum[1]});
}
};
Expand Down Expand Up @@ -1141,7 +1119,7 @@
TVector3 hyp2Momentum(pairInfo.antiHyperonMomentum[0], pairInfo.antiHyperonMomentum[1], pairInfo.antiHyperonMomentum[2]);
pairInfo.OpAngle = hyp1Momentum.Angle(hyp2Momentum);

if (d < 1e-5f) { // Parallel or nearly parallel lines
if (d < 1e-5f) { // Parallel or nearly parallel lines
pairInfo.X = pairInfo.Y = pairInfo.Z = -999.f; // should we use another dummy value? Perhaps 999.f?
return pairInfo;
}
Expand Down Expand Up @@ -1221,7 +1199,6 @@
return pairInfo;
}


template <typename TCollision>
bool isEventAccepted(TCollision collision, bool fillHists)
// check whether the collision passes our collision selections
Expand Down Expand Up @@ -2234,7 +2211,7 @@
if (std::fabs(rapiditymc) > rapidityCut)
return;

if (hyperonMC.pdgCodeMother() == 441 && hyperonMC.pdgCodeMother() == antiHyperonMC.pdgCodeMother()) { // EtaC(1S)

Check failure on line 2214 in PWGDQ/Tasks/quarkoniaToHyperons.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
histos.fill(HIST("K0sK0s/h3dInvMassTrueEtaC1S"), centrality, ptmc, invmass);
}
if (hyperonMC.pdgCodeMother() == 443 && hyperonMC.pdgCodeMother() == antiHyperonMC.pdgCodeMother()) { // J/psi
Expand Down
83 changes: 41 additions & 42 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,47 +283,47 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_006, "AOD", "STRAEVSELS", 6, //!
evsel::Sel8, evsel::Selection, //! event selection: sel8
mult::MultFT0A, mult::MultFT0C, mult::MultFV0A, // FIT detectors
mult::MultFDDA, mult::MultFDDC,
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
mult::MultPVTotalContributors, // number of PV contribs total
mult::MultNTracksGlobal, // global track multiplicities
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
evsel::Rct); // Bitmask of RCT flags

DECLARE_SOA_TABLE(StraEvSelExtras_000, "AOD", "STRAEVSELEXTRAS", //! debug information
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
udcollision::TimeFDDA, // Average A-side time (ns)
udcollision::TimeFDDC, // Average C-side time (ns)
udcollision::TimeFV0A, // Average A-side time (ns)
udcollision::TimeFT0A, // Average A-side time (ns)
udcollision::TimeFT0C, // Average C-side time (ns)
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent

DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1, //! debug information
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
mult::MultPVTotalContributors, // number of PV contribs total
mult::MultNTracksGlobal, // global track multiplicities
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
evsel::Rct); // Bitmask of RCT flags

DECLARE_SOA_TABLE(StraEvSelExtras_000, "AOD", "STRAEVSELEXTRAS", //! debug information
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
udcollision::TimeFDDA, // Average A-side time (ns)
udcollision::TimeFDDC, // Average C-side time (ns)
udcollision::TimeFV0A, // Average A-side time (ns)
udcollision::TimeFT0A, // Average A-side time (ns)
udcollision::TimeFT0C, // Average C-side time (ns)
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent

DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1, //! debug information
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
mult::MultZEM2, mult::MultZPA, mult::MultZPC,
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
udcollision::TimeFDDA, // Average A-side time (ns)
udcollision::TimeFDDC, // Average C-side time (ns)
udcollision::TimeFV0A, // Average A-side time (ns)
udcollision::TimeFT0A, // Average A-side time (ns)
udcollision::TimeFT0C, // Average C-side time (ns)
udcollision::TriggerMaskFT0, // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
udcollision::GapSide, // UPC info: 0 for side A, 1 for side C, 2 for both sides, 3 neither A or C, 4 not enough or too many pv contributors
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
udcollision::TimeFDDA, // Average A-side time (ns)
udcollision::TimeFDDC, // Average C-side time (ns)
udcollision::TimeFV0A, // Average A-side time (ns)
udcollision::TimeFT0A, // Average A-side time (ns)
udcollision::TimeFT0C, // Average C-side time (ns)
udcollision::TriggerMaskFT0, // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
udcollision::GapSide, // UPC info: 0 for side A, 1 for side C, 2 for both sides, 3 neither A or C, 4 not enough or too many pv contributors
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
// Dynamic columns for manipulating information
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
// stracollision::TotalFT0AmplitudeA<mult::MultFT0A>,
Expand All @@ -332,8 +332,7 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1,
// stracollision::TotalFDDAmplitudeC<mult::MultFDDC>,
// stracollision::EnergyCommonZNA<mult::MultZNA>,
// stracollision::EnergyCommonZNC<mult::MultZNC>,
stracollision::IsUPC<udcollision::GapSide>
);
stracollision::IsUPC<udcollision::GapSide>);

DECLARE_SOA_TABLE(StraEvSelsRun2, "AOD", "STRAEVSELSRUN2", //! debug information
evsel::Sel8, evsel::Sel7, evsel::Selection, //! event selection: sel8
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct straevselextrasconverter2 {
-999., // dummy timeFV0A,
-999., // dummy timeFT0A,
-999., // dummy timeFT0C,
0, // dummy triggerMaskFT0,
0, // dummy triggerMaskFT0,
-999, // dummy gapSide,
-999., // dummy totalFT0AmplitudeA,
-999., // dummy totalFT0AmplitudeC,
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Strangeness/cascadeflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#include "Framework/O2DatabasePDGPlugin.h"
#include "Framework/runDataProcessing.h"

#include "Math/GenVector/Boost.h"
#include "Math/Vector3D.h"
#include "Math/Vector4D.h"
#include "Math/GenVector/Boost.h"
#include "TRandom3.h"

#include <memory>
Expand Down
6 changes: 3 additions & 3 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ struct strangederivedbuilder {
products.strangeCents(collision.centFT0M(), collision.centFT0A(),
centrality, collision.centFV0A(), collision.centFT0CVariant1(), collision.centFT0CVariant2(),
collision.centMFT(), collision.centNGlobal(), collision.centNTPV());
products.strangeEvSels(collision.sel8(), collision.selection_raw(),
products.strangeEvSels(collision.sel8(), collision.selection_raw(),
collision.multFT0A() * static_cast<float>(fillTruncationOptions.fillRawFT0A),
collision.multFT0C() * static_cast<float>(fillTruncationOptions.fillRawFT0C),
collision.multFV0A() * static_cast<float>(fillTruncationOptions.fillRawFV0A),
Expand All @@ -584,8 +584,8 @@ struct strangederivedbuilder {
collision.multAllTracksITSTPC() * static_cast<int>(fillTruncationOptions.fillRawNTracksForCorrelation),
collision.trackOccupancyInTimeRange(),
collision.ft0cOccupancyInTimeRange(),
timeFDDA, timeFDDC, // FDD info
timeFV0A, // FV0A info
timeFDDA, timeFDDC, // FDD info
timeFV0A, // FV0A info
timeFT0A, timeFT0C, ft0TriggerMask, // FT0 info
// UPC info
gapSide,
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/Tasks/QC/strderivedGenQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/RCTSelectionFlags.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/PhysicsConstants.h"
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/Tasks/Resonances/higherMassResonances.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h" //

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
Expand All @@ -25,8 +27,6 @@
#include "Common/DataModel/PIDResponseTOF.h" //
#include "Common/DataModel/PIDResponseTPC.h" //
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/RCTSelectionFlags.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
Expand Down
Loading
Loading