Skip to content

Commit 1b56dbb

Browse files
victor-gonzalezVictor
andauthored
[PWGCF] DptDpt - Applying clang for ordering header includes (#12517)
Co-authored-by: Victor <victor@cern.ch>
1 parent b8de427 commit 1b56dbb

File tree

8 files changed

+138
-121
lines changed

8 files changed

+138
-121
lines changed

PWGCF/TableProducer/dptDptFilter.cxx

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,43 @@
1313
/// \brief Filters collisions and tracks according to selection criteria
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16-
#include <cmath>
17-
#include <algorithm>
18-
#include <string>
19-
#include <vector>
16+
#include "PWGCF/TableProducer/dptDptFilter.h"
17+
18+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
19+
#include "PWGCF/DataModel/DptDptFiltered.h"
2020

21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Framework/ASoAHelpers.h"
24-
#include "CommonConstants/PhysicsConstants.h"
25-
#include "Common/DataModel/EventSelection.h"
26-
#include "Common/DataModel/Centrality.h"
2721
#include "Common/Core/TableHelper.h"
2822
#include "Common/Core/TrackSelection.h"
2923
#include "Common/Core/TrackSelectionDefaults.h"
24+
#include "Common/DataModel/Centrality.h"
25+
#include "Common/DataModel/CollisionAssociationTables.h"
26+
#include "Common/DataModel/EventSelection.h"
3027
#include "Common/DataModel/PIDResponse.h"
31-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
32-
#include "PWGCF/DataModel/DptDptFiltered.h"
3328
#include "Common/DataModel/TrackSelectionTables.h"
34-
#include "Common/DataModel/CollisionAssociationTables.h"
29+
30+
#include "CommonConstants/PhysicsConstants.h"
31+
#include "Framework/ASoAHelpers.h"
32+
#include "Framework/AnalysisDataModel.h"
33+
#include "Framework/AnalysisTask.h"
3534
#include "Framework/O2DatabasePDGPlugin.h"
36-
#include "Framework/runDataProcessing.h"
3735
#include "Framework/RunningWorkflowInfo.h"
38-
#include <TROOT.h>
39-
#include <TPDGCode.h>
40-
#include <TParameter.h>
41-
#include <TList.h>
36+
#include "Framework/runDataProcessing.h"
37+
4238
#include <TDirectory.h>
4339
#include <TFolder.h>
4440
#include <TH1.h>
4541
#include <TH2.h>
4642
#include <TH3.h>
43+
#include <TList.h>
44+
#include <TPDGCode.h>
45+
#include <TParameter.h>
4746
#include <TProfile3D.h>
47+
#include <TROOT.h>
4848

49-
#include "PWGCF/TableProducer/dptDptFilter.h"
49+
#include <algorithm>
50+
#include <cmath>
51+
#include <string>
52+
#include <vector>
5053

5154
using namespace o2;
5255
using namespace o2::framework;

PWGCF/TableProducer/dptDptFilter.h

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,36 @@
1616
#ifndef PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
1717
#define PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
1818

19+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
20+
21+
#include "Common/Core/RecoDecay.h"
22+
#include "Common/Core/TrackSelection.h"
23+
#include "Common/Core/TrackSelectionDefaults.h"
24+
#include "Common/DataModel/Centrality.h"
25+
#include "Common/DataModel/EventSelection.h"
26+
#include "Common/DataModel/Multiplicity.h"
27+
#include "Common/DataModel/TrackSelectionTables.h"
28+
29+
#include "Framework/AnalysisDataModel.h"
30+
#include "Framework/AnalysisTask.h"
31+
#include "ReconstructionDataFormats/PID.h"
1932
#include <CCDB/BasicCCDBManager.h>
20-
#include <TPDGCode.h>
21-
#include <TMCProcess.h>
33+
2234
#include <TF1.h>
2335
#include <TList.h>
24-
#include <vector>
36+
#include <TMCProcess.h>
37+
#include <TPDGCode.h>
38+
2539
#include <bitset>
26-
#include <string>
27-
#include <iomanip>
2840
#include <fstream>
29-
#include <locale>
30-
#include <sstream>
31-
#include <ranges>
3241
#include <functional>
42+
#include <iomanip>
43+
#include <locale>
3344
#include <map>
34-
35-
#include "ReconstructionDataFormats/PID.h"
36-
#include "Framework/AnalysisTask.h"
37-
#include "Framework/AnalysisDataModel.h"
38-
#include "Common/DataModel/EventSelection.h"
39-
#include "Common/DataModel/Multiplicity.h"
40-
#include "Common/DataModel/Centrality.h"
41-
#include "Common/DataModel/TrackSelectionTables.h"
42-
#include "Common/Core/RecoDecay.h"
43-
#include "Common/Core/TrackSelection.h"
44-
#include "Common/Core/TrackSelectionDefaults.h"
45-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
45+
#include <ranges>
46+
#include <sstream>
47+
#include <string>
48+
#include <vector>
4649

4750
namespace o2
4851
{

PWGCF/Tasks/dptDptCorrelations.cxx

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,26 @@
1313
/// \brief implements two-particle correlations base data collection
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
17+
#include "PWGCF/Core/PairCuts.h"
18+
#include "PWGCF/DataModel/DptDptFiltered.h"
19+
#include "PWGCF/TableProducer/dptDptFilter.h"
20+
21+
#include "Common/Core/RecoDecay.h"
22+
#include "Common/Core/TableHelper.h"
23+
#include "Common/Core/TrackSelection.h"
24+
#include "Common/DataModel/Centrality.h"
25+
#include "Common/DataModel/EventSelection.h"
26+
#include "Common/DataModel/TrackSelectionTables.h"
27+
28+
#include "DataFormatsParameters/GRPObject.h"
29+
#include "Framework/ASoAHelpers.h"
30+
#include "Framework/AnalysisDataModel.h"
31+
#include "Framework/AnalysisTask.h"
32+
#include "Framework/RunningWorkflowInfo.h"
33+
#include "Framework/runDataProcessing.h"
1634
#include <CCDB/BasicCCDBManager.h>
35+
1736
#include <TDirectory.h>
1837
#include <TFolder.h>
1938
#include <TH1.h>
@@ -24,28 +43,12 @@
2443
#include <TProfile3D.h>
2544
#include <TROOT.h>
2645
#include <TVector2.h>
46+
47+
#include <cmath>
2748
#include <cstdio>
49+
#include <ctime>
2850
#include <string>
2951
#include <vector>
30-
#include <cmath>
31-
#include <ctime>
32-
33-
#include "Common/Core/TrackSelection.h"
34-
#include "Common/Core/TableHelper.h"
35-
#include "Common/Core/RecoDecay.h"
36-
#include "Common/DataModel/Centrality.h"
37-
#include "Common/DataModel/EventSelection.h"
38-
#include "Common/DataModel/TrackSelectionTables.h"
39-
#include "DataFormatsParameters/GRPObject.h"
40-
#include "Framework/ASoAHelpers.h"
41-
#include "Framework/AnalysisDataModel.h"
42-
#include "Framework/AnalysisTask.h"
43-
#include "Framework/runDataProcessing.h"
44-
#include "Framework/RunningWorkflowInfo.h"
45-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
46-
#include "PWGCF/Core/PairCuts.h"
47-
#include "PWGCF/DataModel/DptDptFiltered.h"
48-
#include "PWGCF/TableProducer/dptDptFilter.h"
4952

5053
using namespace o2;
5154
using namespace o2::framework;
@@ -279,15 +282,17 @@ struct DptDptCorrelations {
279282
photon = p1+p2;
280283
photon.M()*/
281284

282-
float tantheta1 = 1e10;
285+
constexpr float kLARGETANTHETA = 1e10;
286+
constexpr float kVERYSMALLETA = 1e-10;
287+
float tantheta1 = kLARGETANTHETA;
283288

284-
if (track1.eta() < -1e-10 || track1.eta() > 1e-10) {
289+
if (track1.eta() < -kVERYSMALLETA || track1.eta() > kVERYSMALLETA) {
285290
float expTmp = std::exp(-track1.eta());
286291
tantheta1 = 2.0 * expTmp / (1.0 - expTmp * expTmp);
287292
}
288293

289-
float tantheta2 = 1e10;
290-
if (track2.eta() < -1e-10 || track2.eta() > 1e-10) {
294+
float tantheta2 = kLARGETANTHETA;
295+
if (track2.eta() < -kVERYSMALLETA || track2.eta() > kVERYSMALLETA) {
291296
float expTmp = std::exp(-track2.eta());
292297
tantheta2 = 2.0 * expTmp / (1.0 - expTmp * expTmp);
293298
}

PWGCF/Tasks/dptDptFilterQa.cxx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
/// \brief basic checks for the behavior of the filter task
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16-
#include <cmath>
17-
#include <string>
16+
#include "PWGCF/DataModel/DptDptFiltered.h"
17+
#include "PWGCF/TableProducer/dptDptFilter.h"
1818

1919
#include "Framework/ASoAHelpers.h"
2020
#include "Framework/AnalysisDataModel.h"
2121
#include "Framework/AnalysisTask.h"
2222
#include "Framework/runDataProcessing.h"
23-
#include "PWGCF/DataModel/DptDptFiltered.h"
24-
#include "PWGCF/TableProducer/dptDptFilter.h"
23+
24+
#include <cmath>
25+
#include <string>
2526

2627
using namespace o2;
2728
using namespace o2::framework;

PWGCF/Tasks/matchRecoGen.cxx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,24 @@
1313
/// \brief basic check for the matching between generator level and detector level
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16-
#include <cmath>
17-
#include <string>
18-
#include <vector>
16+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
17+
#include "PWGCF/DataModel/DptDptFiltered.h"
18+
#include "PWGCF/TableProducer/dptDptFilter.h"
1919

20+
#include "Common/Core/RecoDecay.h"
2021
#include "Common/Core/TrackSelection.h"
2122
#include "Common/Core/TrackSelectionDefaults.h"
22-
#include "Common/Core/RecoDecay.h"
2323
#include "Common/DataModel/Centrality.h"
2424
#include "Common/DataModel/EventSelection.h"
2525
#include "Common/DataModel/PIDResponse.h"
2626
#include "Common/DataModel/TrackSelectionTables.h"
27+
2728
#include "Framework/ASoAHelpers.h"
2829
#include "Framework/AnalysisDataModel.h"
2930
#include "Framework/AnalysisTask.h"
3031
#include "Framework/O2DatabasePDGPlugin.h"
3132
#include "Framework/runDataProcessing.h"
32-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
33-
#include "PWGCF/DataModel/DptDptFiltered.h"
34-
#include "PWGCF/TableProducer/dptDptFilter.h"
33+
3534
#include <TDirectory.h>
3635
#include <TFolder.h>
3736
#include <TH1.h>
@@ -42,6 +41,10 @@
4241
#include <TProfile3D.h>
4342
#include <TROOT.h>
4443

44+
#include <cmath>
45+
#include <string>
46+
#include <vector>
47+
4548
using namespace o2;
4649
using namespace o2::framework;
4750
using namespace o2::soa;

PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,38 @@
1313
/// \brief Provides efficiency extraction and QC for track cuts and PID
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16-
#include <TH2F.h>
17-
#include <TProfile2D.h>
18-
#include <THnSparse.h>
19-
#include <TPDGCode.h>
20-
#include <TMCProcess.h>
21-
#include <CCDB/BasicCCDBManager.h>
22-
#include <vector>
23-
#include <algorithm>
24-
#include <cstdio>
25-
#include <memory>
26-
#include <string>
27-
#include "ReconstructionDataFormats/PID.h"
28-
#include "Common/Core/TrackSelection.h"
29-
#include "Common/Core/TableHelper.h"
16+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
17+
#include "PWGCF/DataModel/DptDptFiltered.h"
18+
#include "PWGCF/TableProducer/dptDptFilter.h"
19+
3020
#include "Common/Core/RecoDecay.h"
31-
#include "Common/DataModel/TrackSelectionTables.h"
21+
#include "Common/Core/TableHelper.h"
22+
#include "Common/Core/TrackSelection.h"
3223
#include "Common/DataModel/PIDResponse.h"
24+
#include "Common/DataModel/TrackSelectionTables.h"
25+
3326
#include "Framework/ASoAHelpers.h"
34-
#include "Framework/Expressions.h"
3527
#include "Framework/AnalysisDataModel.h"
3628
#include "Framework/AnalysisTask.h"
37-
#include "Framework/runDataProcessing.h"
29+
#include "Framework/Expressions.h"
3830
#include "Framework/RunningWorkflowInfo.h"
31+
#include "Framework/runDataProcessing.h"
32+
#include "ReconstructionDataFormats/PID.h"
33+
#include <CCDB/BasicCCDBManager.h>
34+
3935
#include "Math/MatrixFunctions.h"
4036
#include "Math/SMatrix.h"
37+
#include <TH2F.h>
38+
#include <THnSparse.h>
39+
#include <TMCProcess.h>
40+
#include <TPDGCode.h>
41+
#include <TProfile2D.h>
4142

42-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
43-
#include "PWGCF/DataModel/DptDptFiltered.h"
44-
#include "PWGCF/TableProducer/dptDptFilter.h"
43+
#include <algorithm>
44+
#include <cstdio>
45+
#include <memory>
46+
#include <string>
47+
#include <vector>
4548

4649
using namespace o2;
4750
using namespace o2::framework;
@@ -741,41 +744,41 @@ struct PidDataCollectingEngine {
741744
if constexpr (kindOfData == kReco) {
742745
/* PID histograms */
743746
std::vector<std::string> whenname{"Before", "After"};
744-
constexpr char whenprefix[kNoOfSteps]{'B', 'A'};
747+
constexpr char kWhenPrefix[kNoOfSteps]{'B', 'A'};
745748
std::vector<std::string> whentitle{"before", ""};
746749
for (uint ix = 0; ix < kNoOfSteps; ++ix) {
747750
fhTPCdEdxSignalVsP[ix] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
748-
HNAMESTRING("tpcSignalVsP%c", whenprefix[ix]),
751+
HNAMESTRING("tpcSignalVsP%c", kWhenPrefix[ix]),
749752
HTITLESTRING("TPC dE/dx signal %s", whentitle[ix].c_str()), kTH2F, {pidPAxis, dEdxAxis});
750753
fhTOFSignalVsP[ix] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
751-
HNAMESTRING("tofSignalVsP%c", whenprefix[ix]),
754+
HNAMESTRING("tofSignalVsP%c", kWhenPrefix[ix]),
752755
HTITLESTRING("TOF signal %s", whentitle[ix].c_str()),
753756
kTH2F, {pidPAxis, {200, 0.0, 1.1, "#beta"}});
754757
fhPvsTOFSqMass[ix] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
755-
HNAMESTRING("tofPvsMassSq%c", whenprefix[ix]),
758+
HNAMESTRING("tofPvsMassSq%c", kWhenPrefix[ix]),
756759
HTITLESTRING("Momentum versus #it{m}^{2} %s", whentitle[ix].c_str()),
757760
kTH2F, {{140, 0.0, 1.4, "#it{m}^{2} ((GeV/c^{2})^{2})"}, pidPAxis});
758761
for (uint isp = 0; isp < nmainsp; ++isp) {
759762
fhTPCdEdxSignalDiffVsP[ix][isp] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
760-
HNAMESTRING("tpcSignalDiffVsP%c_%s", whenprefix[ix], mainspnames[isp].c_str()),
763+
HNAMESTRING("tpcSignalDiffVsP%c_%s", kWhenPrefix[ix], mainspnames[isp].c_str()),
761764
HTITLESTRING("TPC dE/dx to the %s line %s", mainsptitles[isp].c_str(), whentitle[ix].c_str()),
762765
kTH2F, {pidPAxis, {400, -200.0, 200.0, FORMATSTRING("dE/dx - <dE/dx>_{%s}", mainsptitles[isp].c_str())}});
763766
fhTOFSignalDiffVsP[ix][isp] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
764-
HNAMESTRING("tofSignalDiffVsP%c_%s", whenprefix[ix], mainspnames[isp].c_str()),
767+
HNAMESTRING("tofSignalDiffVsP%c_%s", kWhenPrefix[ix], mainspnames[isp].c_str()),
765768
HTITLESTRING("#Delta^{TOF_{%s}} %s", mainsptitles[isp].c_str(), whentitle[ix].c_str()),
766769
kTH2F, {pidPAxis, {200, -1000.0, 1000.0, FORMATSTRING("t-t_{ev}-t_{exp_{%s}} (ps)", mainsptitles[isp].c_str())}});
767770
fhTPCTOFSigmaVsP[ix][isp] = ADDHISTOGRAM(TH3, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
768-
HNAMESTRING("toftpcNSigmasVsP%c_%s", whenprefix[ix], mainspnames[isp].c_str()),
771+
HNAMESTRING("toftpcNSigmasVsP%c_%s", kWhenPrefix[ix], mainspnames[isp].c_str()),
769772
HTITLESTRING("n#sigma to the %s line %s", mainsptitles[isp].c_str(), whentitle[ix].c_str()),
770773
kTH3F, {pidPAxis, {noOfNSigmaBins, minNSigma, maxNSigma, FORMATSTRING("n#sigma_{TPC}^{%s}", mainsptitles[isp].c_str())}, {120, -6.0, 6.0, FORMATSTRING("n#sigma_{TOF}^{%s}", mainsptitles[isp].c_str())}});
771774
}
772775
for (uint isp = 0; isp < nallmainsp; ++isp) {
773776
fhTPCnSigmasVsP[ix][isp] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
774-
HNAMESTRING("tpcNSigmasVsP%c_%s", whenprefix[ix], allmainspnames[isp].c_str()),
777+
HNAMESTRING("tpcNSigmasVsP%c_%s", kWhenPrefix[ix], allmainspnames[isp].c_str()),
775778
HTITLESTRING("TPC n#sigma to the %s line %s", allmainsptitles[isp].c_str(), whentitle[ix].c_str()),
776779
kTH2F, {pidPAxis, {noOfNSigmaBins, minNSigma, maxNSigma, FORMATSTRING("n#sigma_{TPC}^{%s}", allmainsptitles[isp].c_str())}});
777780
fhTOFnSigmasVsP[ix][isp] = ADDHISTOGRAM(TH2, DIRECTORYSTRING("%s/%s/%s", dirname, "PID", whenname[ix].c_str()),
778-
HNAMESTRING("tofNSigmasVsP%c_%s", whenprefix[ix], allmainspnames[isp].c_str()),
781+
HNAMESTRING("tofNSigmasVsP%c_%s", kWhenPrefix[ix], allmainspnames[isp].c_str()),
779782
HTITLESTRING("TOF n#sigma to the %s line %s", allmainsptitles[isp].c_str(), whentitle[ix].c_str()),
780783
kTH2F, {pidPAxis, {noOfNSigmaBins, minNSigma, maxNSigma, FORMATSTRING("n#sigma_{TOF}^{%s}", allmainsptitles[isp].c_str())}});
781784
}

PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
/// \brief basic per run check of the per analyzed species p vs TPC IW momentum
1414
/// \author victor.gonzalez.sebastian@gmail.com
1515

16-
#include <array>
17-
#include <cmath>
18-
#include <unordered_map>
16+
#include "PWGCF/DataModel/DptDptFiltered.h"
17+
#include "PWGCF/TableProducer/dptDptFilter.h"
1918

19+
#include "Framework/ASoAHelpers.h"
2020
#include "Framework/AnalysisDataModel.h"
2121
#include "Framework/AnalysisTask.h"
22-
#include "Framework/ASoAHelpers.h"
2322
#include "Framework/HistogramRegistry.h"
2423
#include "Framework/runDataProcessing.h"
2524

26-
#include "PWGCF/DataModel/DptDptFiltered.h"
27-
#include "PWGCF/TableProducer/dptDptFilter.h"
25+
#include <array>
26+
#include <cmath>
27+
#include <unordered_map>
2828

2929
using namespace o2;
3030
using namespace o2::framework;

0 commit comments

Comments
 (0)