Skip to content

[PWGCF] Please consider the following formatting changes to #12544 #27

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

Closed
alibuild wants to merge 28 commits into from
Closed

[PWGCF] Please consider the following formatting changes to #12544 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7b2266f
Making the headers self-sufficient
alibuild Aug 12, 2025
2414298
Making the headers self-sufficient
alibuild Aug 12, 2025
4b4bc15
Making the headers self-sufficient
alibuild Aug 12, 2025
68f1099
Making the headers self-sufficient
alibuild Aug 12, 2025
2a7a159
Making the headers self-sufficient
alibuild Aug 12, 2025
7ad24c9
Making the headers self-sufficient
alibuild Aug 12, 2025
a943a5f
Making the headers self-sufficient
alibuild Aug 12, 2025
fae28ea
Making the headers self-sufficient
alibuild Aug 12, 2025
cfd0fc4
Making the headers self-sufficient
alibuild Aug 12, 2025
e8ba8f6
Making the headers self-sufficient
alibuild Aug 12, 2025
a6e39f6
Making the headers self-sufficient
alibuild Aug 12, 2025
062da08
Making the headers self-sufficient
alibuild Aug 12, 2025
67eb5c8
Making the headers self-sufficient
alibuild Aug 12, 2025
07d88cd
Making the headers self-sufficient
alibuild Aug 12, 2025
72944ad
Making the headers self-sufficient
alibuild Aug 12, 2025
80f7951
Making the headers self-sufficient
alibuild Aug 12, 2025
d7c6284
Making the headers self-sufficient
alibuild Aug 12, 2025
fe1e443
Making the headers self-sufficient
alibuild Aug 12, 2025
9410996
Making the headers self-sufficient
alibuild Aug 12, 2025
d8f4920
Making the headers self-sufficient
alibuild Aug 12, 2025
662ff2e
Making the headers self-sufficient
alibuild Aug 12, 2025
d1253ca
Making the headers self-sufficient
alibuild Aug 12, 2025
b62c41c
Replace fairlogger with Framework
alibuild Aug 12, 2025
fe8f8b1
Replace fairlogger with Framework
alibuild Aug 12, 2025
ea70578
Replace fairlogger with Framework
alibuild Aug 12, 2025
438b940
Replace fairlogger with Framework
alibuild Aug 12, 2025
30563db
Replace fairlogger with Framework
alibuild Aug 12, 2025
747a483
Please consider the following formatting changes
alibuild Aug 12, 2025
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
View file
Open in desktop
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/FemtoUniverseEventHisto.h"
#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"

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.

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.
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.
mPDGOne = pdg1;
mPDGTwo = pdg2;
}
Expand Down
16 changes: 10 additions & 6 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,21 @@
#ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
#define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_

#include <fairlogger/Logger.h>
#include <vector>
#include <string>
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.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"
#include "TMath.h"

#include <string>
#include <vector>

using namespace o2::framework;

Expand Down
7 changes: 5 additions & 2 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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