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
13 changes: 8 additions & 5 deletions PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_

#include <fairlogger/Logger.h>
#include <vector>
#include <string>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"

#include "Framework/HistogramRegistry.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
#include <Framework/Logger.h>

#include "Math/Vector4D.h"
#include "TMath.h"
#include "TDatabasePDG.h"

Check failure on line 27 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 27 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
#include "TMath.h"

#include <string>
#include <vector>

using namespace o2::framework;

Check failure on line 33 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

Check failure on line 33 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

namespace o2::analysis::femto_universe
{
Expand Down Expand Up @@ -155,8 +158,8 @@
/// \param pdg2 PDG code of particle two
void setPDGCodes(const int pdg1, const int pdg2)
{
mMassOne = TDatabasePDG::Instance()->GetParticle(pdg1)->Mass();

Check failure on line 161 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 161 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
mMassTwo = TDatabasePDG::Instance()->GetParticle(pdg2)->Mass();

Check failure on line 162 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 162 in PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
mPDGOne = pdg1;
mPDGTwo = pdg2;
}
Expand Down
15 changes: 9 additions & 6 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,22 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_

#include <fairlogger/Logger.h>
#include <vector>
#include <string>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"

#include "Framework/HistogramRegistry.h"
#include "Common/Core/RecoDecay.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"

#include "Framework/HistogramRegistry.h"
#include <Framework/Logger.h>

#include "Math/Vector4D.h"
#include "TMath.h"
#include "TDatabasePDG.h"

Check failure on line 32 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 32 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
#include "TMath.h"

#include <string>
#include <vector>

using namespace o2::framework;

Check failure on line 38 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

Check failure on line 38 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

namespace o2::analysis::femto_universe
{
Expand Down Expand Up @@ -141,8 +144,8 @@
/// \param pdg2 PDG code of particle two
void setPDGCodes(const int pdg1, const int pdg2)
{
mMassOne = TDatabasePDG::Instance()->GetParticle(pdg1)->Mass();

Check failure on line 147 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 147 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
mMassTwo = TDatabasePDG::Instance()->GetParticle(pdg2)->Mass();

Check failure on line 148 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

Check failure on line 148 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
mPDGOne = pdg1;
mPDGTwo = pdg2;
}
Expand All @@ -161,10 +164,10 @@
deltaPhi = part1.phi() - part2.phi();

while (deltaPhi < mPhiLow) {
deltaPhi += o2::constants::math::TwoPI;

Check failure on line 167 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Use RecoDecay::constrainAngle to restrict angle to a given range.

Check failure on line 167 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Use RecoDecay::constrainAngle to restrict angle to a given range.
}
while (deltaPhi > mPhiHigh) {
deltaPhi -= o2::constants::math::TwoPI;

Check failure on line 170 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Use RecoDecay::constrainAngle to restrict angle to a given range.

Check failure on line 170 in PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Use RecoDecay::constrainAngle to restrict angle to a given range.
}

mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + HIST(o2::aod::femtouniverse_mc_particle::MCTypeName[mc]) + HIST("/DeltaEtaDeltaPhi"), deltaPhi, deltaEta, weight);
Expand Down
7 changes: 5 additions & 2 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_

#include <string>
#include <vector>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"

#include "Common/Core/RecoDecay.h"

#include "Framework/HistogramRegistry.h"
#include "ReconstructionDataFormats/PID.h"

#include <string>
#include <vector>

namespace o2::analysis::femto_universe
{
namespace femto_universe_cascade_selection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_

#include <string>
#include "Common/CCDB/TriggerAliases.h"

#include "Framework/HistogramRegistry.h"
#include "Framework/Logger.h"

#include <string>

using namespace o2::framework;

namespace o2::analysis::femto_universe
Expand Down
3 changes: 1 addition & 2 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
#include "Common/Core/RecoDecay.h"

#include "Framework/HistogramRegistry.h"
#include <Framework/Logger.h>

#include "Math/Vector4D.h"
#include "TDatabasePDG.h"
#include "TMath.h"

#include <fairlogger/Logger.h>

#include <string>
#include <vector>

Expand Down
17 changes: 9 additions & 8 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_

#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"

#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>

#include <algorithm>
#include <bitset>
#include <iostream>
#include <iterator>
#include <random>
#include <string>
#include <vector>
#include <algorithm>
#include <iterator>
#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>

#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"

namespace o2::analysis::femto_universe
{
Expand Down
16 changes: 9 additions & 7 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_

#include <vector>
#include <map>
#include <string>
#include <algorithm>
#include "FemtoUniverseParticleHisto.h"

#include "Framework/Configurable.h"
#include "CCDB/BasicCCDBManager.h"
#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
#include "FemtoUniverseParticleHisto.h"

#include "CCDB/BasicCCDBManager.h"
#include "Framework/Configurable.h"

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

namespace o2::analysis::femto_universe::efficiency
{
Expand Down
1 change: 1 addition & 0 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEVENTHISTO_H_

#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"

#include "Framework/HistogramRegistry.h"

using namespace o2::framework;
Expand Down
11 changes: 6 additions & 5 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_

#include <fairlogger/Logger.h>
#include <vector>
#include <string>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"

#include "Framework/HistogramRegistry.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
#include <Framework/Logger.h>

#include "Math/Vector4D.h"
#include "TMath.h"
#include "TDatabasePDG.h"
#include "TMath.h"

#include <string>
#include <vector>

using namespace o2::framework;

Expand Down
8 changes: 4 additions & 4 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_

#include <vector>
#include <algorithm>

#include "Math/Vector4D.h"
#include "Math/Boost.h"
#include "Math/Vector4D.h"
#include "TLorentzVector.h"
#include "TMath.h"

#include <algorithm>
#include <vector>

namespace o2::analysis::femto_universe
{

Expand Down
14 changes: 8 additions & 6 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_

#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"

#include "Framework/HistogramRegistry.h"
#include "ReconstructionDataFormats/PID.h"

#include <algorithm>
#include <string>
#include <vector>

#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "ReconstructionDataFormats/PID.h"
#include "Framework/HistogramRegistry.h"
#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"

using namespace o2;
using namespace o2::framework;

Expand Down Expand Up @@ -181,7 +182,8 @@ class FemtoUniverseObjectSelection
std::vector<selVariable> selVarVec;
for (auto it : mSelections) {
auto selVar = it.getSelectionVariable();
if (std::none_of(selVarVec.begin(), selVarVec.end(), [selVar](selVariable a) { return a == selVar; })) {
if (std::none_of(selVarVec.begin(), selVarVec.end(),
[selVar](selVariable a) { return a == selVar; })) {
selVarVec.push_back(selVar);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_

#include "Framework/HistogramRegistry.h"

#include <string>
#include <vector>
#include "Framework/HistogramRegistry.h"

namespace o2::analysis::femto_universe
{
Expand Down
1 change: 1 addition & 0 deletions PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRCLEANER_H_

#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"

#include "Framework/HistogramRegistry.h"

namespace o2::analysis::femto_universe
Expand Down
9 changes: 6 additions & 3 deletions PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_

#include <vector>
#include <string>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"

#include "Framework/HistogramRegistry.h"

#include <complex>
#include <memory>
#include "Framework/HistogramRegistry.h"
#include <string>
#include <vector>

// using namespace o2::constants::physics;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_

#include "Framework/HistogramRegistry.h"

#include <string>
#include <vector>
#include "Framework/HistogramRegistry.h"

namespace o2::analysis::femto_universe
{
Expand Down
8 changes: 5 additions & 3 deletions PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_

#include <string>
#include <vector>

#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"

#include "Common/Core/RecoDecay.h"

#include "Framework/HistogramRegistry.h"
#include "ReconstructionDataFormats/PID.h"

#include "TLorentzVector.h"

#include <string>
#include <vector>

namespace o2::analysis::femto_universe
{
namespace femto_universe_phi_selection
Expand Down
18 changes: 10 additions & 8 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_

#include <fairlogger/Logger.h>
#include <vector>
#include <string>
#include <complex>
#include <memory>

#include "Framework/HistogramRegistry.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h"

#include "Framework/HistogramRegistry.h"
#include <Framework/Logger.h>

#include "Math/Vector4D.h"
#include "TMath.h"
#include "TDatabasePDG.h"
#include "TMath.h"

#include <complex>
#include <memory>
#include <string>
#include <vector>

namespace o2::analysis::femto_universe
{
Expand Down
5 changes: 3 additions & 2 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_

#include <vector>

#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"

#include "Framework/HistogramRegistry.h"

#include <vector>

namespace o2::analysis::femto_universe
{

Expand Down
9 changes: 5 additions & 4 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_

#include <vector>
#include <algorithm>

#include "Math/Vector4D.h"
#include "Math/Boost.h"
#include "Math/Vector4D.h"
#include "TLorentzVector.h"
#include "TMath.h"

#include <algorithm>
#include <complex>
#include <vector>

namespace o2::analysis::femto_universe
{

Expand Down
Loading
Loading