Skip to content

[PWGCF] Fix includes #16088

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

Open
vkucera wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[PWGCF] Fix includes #16088

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: 2 additions & 0 deletions PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <Framework/InitContext.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/StringHelpers.h>
#include <Framework/runDataProcessing.h>

#include <TFormula.h>
Expand All @@ -54,6 +55,7 @@
#include <chrono>
#include <cmath>
#include <concepts>
#include <cstddef>
#include <cstdint>
#include <initializer_list>
#include <limits>
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/PID.h>

#include "TDatabasePDG.h"
#include <TComplex.h>
#include <TDatabasePDG.h>

Check failure on line 40 in PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx

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 <TF1.h>
#include <TH2.h>
#include <THn.h>
#include <TList.h>
#include <TMath.h>
Expand All @@ -49,6 +48,7 @@
#include <TRandom3.h>
#include <TString.h>

#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
Expand Down Expand Up @@ -1018,7 +1018,7 @@
continue;

// charged check
auto pdgEntry = TDatabasePDG::Instance()->GetParticle(mcParticle.pdgCode());

Check failure on line 1021 in PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx

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.
if (!pdgEntry)
continue;
if (pdgEntry->Charge() == 0)
Expand Down Expand Up @@ -1097,7 +1097,7 @@
continue;

// charged check
auto pdgEntry = TDatabasePDG::Instance()->GetParticle(mcParticle.pdgCode());

Check failure on line 1100 in PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx

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.
if (!pdgEntry)
continue;
if (pdgEntry->Charge() == 0)
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/pairHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "PWGCF/Femto/Core/histManager.h"
#include "PWGCF/Femto/Core/modes.h"

#include <Common/Core/RecoDecay.h>
#include "Common/Core/RecoDecay.h"

#include <CommonConstants/MathConstants.h>
#include <Framework/Configurable.h>
Expand Down
18 changes: 9 additions & 9 deletions PWGCF/Femto/Tasks/femtoPairEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/mcCentrality.h"

#include <Common/CCDB/EventSelectionParams.h>
#include <Common/Core/RecoDecay.h>
#include <Common/DataModel/Centrality.h>
#include <Common/DataModel/EventSelection.h>
#include <Common/DataModel/McCollisionExtra.h>
#include <Common/DataModel/Multiplicity.h>
#include <Common/DataModel/PIDResponseTOF.h>
#include <Common/DataModel/PIDResponseTPC.h>
#include <Common/DataModel/TrackSelectionTables.h>
#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/McCollisionExtra.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include <CommonConstants/MathConstants.h>
#include <Framework/ASoAHelpers.h>
Expand Down
1 change: 0 additions & 1 deletion PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
#include <cmath>
#include <cstdint>
#include <cstdlib>
#include <optional>
#include <string>
#include <vector>

Expand Down
31 changes: 24 additions & 7 deletions PWGCF/Flow/Tasks/flowFlucGfwPp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,58 @@
/// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch, Wenya Wu, TUM, wenya.wu@cern.ch

#include "PWGCF/GenericFramework/Core/FlowContainer.h"
#include "PWGCF/GenericFramework/Core/FlowPtContainer.h"
#include "PWGCF/GenericFramework/Core/GFW.h"
#include "PWGCF/GenericFramework/Core/GFWConfig.h"
#include "PWGCF/GenericFramework/Core/GFWWeights.h"

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

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
#include <DataFormatsParameters/GRPMagField.h>
#include <DataFormatsParameters/GRPObject.h>
#include <Framework/ASoAHelpers.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/Expressions.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/RunningWorkflowInfo.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>

#include <TF1.h>
#include <TH1.h>
#include <TH3.h>
#include <TNamed.h>
#include <TObjArray.h>
#include <TPDGCode.h>
#include <TProfile.h>
#include <TRandom3.h>
#include <TString.h>

#include <sys/types.h>

#include <RtypesCore.h>

#include <algorithm>
#include <chrono>
#include <cmath>
#include <complex>
#include <cstdint>
#include <cstdlib>
#include <ctime>
#include <iterator>
#include <map>
#include <numeric>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand Down
2 changes: 0 additions & 2 deletions PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@
#include <cstdlib>
#include <iomanip>
#include <ios>
#include <iterator>
#include <map>
#include <memory>
#include <numeric>
#include <sstream>
#include <string>
#include <string_view>
Expand Down
15 changes: 13 additions & 2 deletions PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,26 @@
#include "Common/DataModel/TrackSelectionTables.h" // needed for aod::TracksDCA table

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/DataTypes.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>

#include <TCollection.h>
#include <TFile.h>
#include <TGrid.h>
#include <TH1D.h>
#include <TH1.h>
#include <TH2.h>
#include <TList.h>
#include <TObject.h>
#include <TString.h>
#include <TSystem.h>

#include <cstdint>
#include <cstring>
#include <string>
#include <vector>
Expand Down Expand Up @@ -332,20 +343,20 @@
float centr = 0;
if (cfCent == 1)
centr = collision.centFT0C();
if (cfCent == 2)

Check failure on line 346 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
centr = collision.centFT0M();
if (cfCent == 3)

Check failure on line 348 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
centr = collision.centFT0A();
event.fHistCentr[eRec]->Fill(centr);
if (cfMult == 1)
event.fHistMult[eRec]->Fill(collision.multTPC());
if (cfMult == 2)

Check failure on line 353 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
event.fHistMult[eRec]->Fill(collision.multFV0M());
if (cfMult == 3)

Check failure on line 355 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
event.fHistMult[eRec]->Fill(collision.multFT0C());
if (cfMult == 4)

Check failure on line 357 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
event.fHistMult[eRec]->Fill(collision.multFT0M());
if (cfMult == 5)

Check failure on line 359 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
event.fHistMult[eRec]->Fill(collision.multNTracksPV());

if constexpr (rs == eRecAndSim) {
Expand Down Expand Up @@ -527,7 +538,7 @@
const char* cpro[] = {"rec", "sim"};
const char* ccut[] = {"before", "after"};
for (int i = 0; i < eEventHistograms_N; i++) {
for (int j = 0; j < 2; j++) {

Check failure on line 541 in PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.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.
for (int k = 0; k < 2; k++) {
TString histname = Form("fEventHistograms[%s][%s][%s]", cevent[i], cpro[j], ccut[k]);
TString histtitle = Form("%s distribution for %s, %s cut", cevent[i], cpro[j], ccut[k]);
Expand Down
25 changes: 18 additions & 7 deletions PWGCF/MultiparticleCorrelations/Tasks/multiparticleCumulants.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,35 @@
/// \brief Task for producing multiparticle cumulants
/// \author Pei-Ying Kuan, TU München, pei-ying.kuan@cern.ch

#include <Common/DataModel/Centrality.h>
#include <Common/DataModel/EventSelection.h>
#include <Common/DataModel/Multiplicity.h>
#include <Common/DataModel/TrackSelectionTables.h> // needed for aod::TracksDCA table
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h" // needed for aod::TracksDCA table

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/DataTypes.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>

#include <TCollection.h>
#include <TFile.h>
#include <TGrid.h>
#include <TH1F.h>
#include <TH2F.h>
#include <TH1.h>
#include <TH2.h>
#include <TList.h>
#include <TObject.h>
#include <TString.h>
#include <TSystem.h>

#include <RtypesCore.h>

#include <cmath>
#include <cstddef>
#include <string>
#include <vector>

Expand Down
3 changes: 0 additions & 3 deletions PWGCF/TwoParticleCorrelations/Tasks/corrFit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/// \author Thor Jensen (thor.kjaersgaard.jensen@cern.ch)

#include "PWGCF/Core/CorrelationContainer.h"
#include "PWGMM/Mult/DataModel/bestCollisionTable.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/RecoDecay.h"
Expand All @@ -28,7 +27,6 @@
#include <DataFormatsParameters/GRPMagField.h>
#include <DetectorsCommonDataFormats/AlignParam.h>
#include <FT0Base/Geometry.h>
#include <FV0Base/Geometry.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -46,7 +44,6 @@
#include <TH3.h>
#include <TRandom3.h>

#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
Expand Down
1 change: 0 additions & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/lambdaSpinPolarization.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include <array>
#include <cmath>
#include <cstdint>
#include <random>
#include <string>
#include <string_view>
#include <vector>
Expand Down
1 change: 0 additions & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/longrangecorrDerived.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

#include <cstdint>
#include <cstdio>
#include <experimental/type_traits>
#include <string>
#include <tuple>
#include <utility>
Expand Down
Loading