Skip to content

Commit 5959fc9

Browse files
romainschotterromainschotter
authored
Merge pull request #71 from alibuild/alibot-cleanup-16486
Please consider the following formatting changes to #16486
2 parents 8f12b02 + a3cea84 commit 5959fc9

12 files changed

Lines changed: 75 additions & 99 deletions

File tree

‎PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
#include "PWGLF/DataModel/LFStrangenessTables.h"
1919
#include "PWGLF/DataModel/cascqaanalysis.h"
2020

21+
#include "Common/CCDB/EventSelectionParams.h"
22+
#include "Common/CCDB/TriggerAliases.h"
2123
#include "Common/Core/TrackSelection.h"
2224
#include "Common/Core/TrackSelectionDefaults.h"
2325
#include "Common/DataModel/Centrality.h"
2426
#include "Common/DataModel/EventSelection.h"
2527
#include "Common/DataModel/Multiplicity.h"
2628
#include "Common/DataModel/TrackSelectionTables.h"
27-
#include "Common/CCDB/EventSelectionParams.h"
28-
#include "Common/CCDB/TriggerAliases.h"
2929

3030
#include "CommonConstants/PhysicsConstants.h"
3131
#include "Framework/ASoAHelpers.h"

‎PWGDQ/Tasks/quarkoniaToHyperons.cxx‎

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,6 @@
2929
// david.dobrigkeit.chinellato@cern.ch
3030
//
3131

32-
#include <Math/Vector4D.h>
33-
#include <cmath>
34-
#include <array>
35-
#include <cstdlib>
36-
#include <map>
37-
#include <string>
38-
#include <vector>
39-
40-
#include <TFile.h>
41-
#include <TH2F.h>
42-
#include <TProfile.h>
43-
#include <TLorentzVector.h>
44-
#include <TPDGCode.h>
45-
#include "Math/Vector3D.h"
46-
47-
#include "DCAFitter/DCAFitterN.h"
48-
#include "DataFormatsParameters/GRPMagField.h"
49-
#include "DataFormatsParameters/GRPObject.h"
50-
#include "DetectorsBase/GeometryManager.h"
51-
#include "DetectorsBase/Propagator.h"
52-
#include "Framework/runDataProcessing.h"
53-
#include "Framework/AnalysisTask.h"
54-
#include "Framework/AnalysisDataModel.h"
55-
#include "Framework/ASoAHelpers.h"
56-
#include "Framework/O2DatabasePDGPlugin.h"
57-
#include "ReconstructionDataFormats/Track.h"
58-
#include "CCDB/BasicCCDBManager.h"
59-
#include "CommonConstants/PhysicsConstants.h"
60-
#include "Common/Core/trackUtilities.h"
61-
#include "PWGLF/DataModel/LFStrangenessTables.h"
6232
#include "PWGLF/DataModel/LFStrangenessMLTables.h"
6333
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
6434
#include "PWGLF/DataModel/LFStrangenessTables.h"
@@ -79,13 +49,19 @@
7949

8050
#include "CCDB/BasicCCDBManager.h"
8151
#include "CommonConstants/PhysicsConstants.h"
52+
#include "DCAFitter/DCAFitterN.h"
53+
#include "DataFormatsParameters/GRPMagField.h"
54+
#include "DataFormatsParameters/GRPObject.h"
55+
#include "DetectorsBase/GeometryManager.h"
56+
#include "DetectorsBase/Propagator.h"
8257
#include "Framework/ASoAHelpers.h"
8358
#include "Framework/AnalysisDataModel.h"
8459
#include "Framework/AnalysisTask.h"
8560
#include "Framework/O2DatabasePDGPlugin.h"
8661
#include "Framework/runDataProcessing.h"
8762
#include "ReconstructionDataFormats/Track.h"
8863

64+
#include "Math/Vector3D.h"
8965
#include <Math/Vector4D.h>
9066
#include <TFile.h>
9167
#include <TH2F.h>
@@ -389,7 +365,7 @@ struct QuarkoniaToHyperons {
389365
ConfigurableAxis axisHypPairPhi{"axisHypPairPhi", {180, 0.0f, constants::math::TwoPI}, "Hyperon pair azimuthal angle (rad)"};
390366
} axes;
391367

392-
o2::base::MatLayerCylSet* lut; // material LUT for DCA fitter
368+
o2::base::MatLayerCylSet* lut; // material LUT for DCA fitter
393369
o2::vertexing::DCAFitterN<2> fitter;
394370

395371
// helper object
@@ -815,8 +791,8 @@ struct QuarkoniaToHyperons {
815791
histos.add("QA/XiXiBar/h3dMassXiXiBarVsDCAPair", "h3dMassXiXiBarVsDCAPair", kTH3F, {axes.axisDCAHypPair, axes.axisPt, axes.axisQuarkoniumMass});
816792
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairCosPA", "h3dMassXiXiBarVsPairCosPA", kTH3F, {axes.axisHypPairCosPA, axes.axisPt, axes.axisQuarkoniumMass});
817793
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairOpAngle", "h3dMassXiXiBarVsPairOpAngle", kTH3F, {axes.axisHypPairOpAngle, axes.axisPt, axes.axisQuarkoniumMass});
818-
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairEta", "h3dMassXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisQuarkoniumMass});
819-
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairPhi", "h3dMassXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisQuarkoniumMass});
794+
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairEta", "h3dMassXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisQuarkoniumMass});
795+
histos.add("QA/XiXiBar/h3dMassXiXiBarVsPairPhi", "h3dMassXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisQuarkoniumMass});
820796
histos.add("QA/LaLaBar/h3dDeltaEtaXiXiBarVsPairEta", "h3dDeltaEtaXiXiBarVsPairEta", kTH3F, {axes.axisHypPairEta, axes.axisPt, axes.axisHypPairEta});
821797
histos.add("QA/LaLaBar/h3dDeltaPhiXiXiBarVsPairPhi", "h3dDeltaPhiXiXiBarVsPairPhi", kTH3F, {axes.axisHypPairPhi, axes.axisPt, axes.axisHypPairPhi});
822798
}
@@ -1082,11 +1058,13 @@ struct QuarkoniaToHyperons {
10821058
std::array<float, 3> antiHyperonMomentum = {0.0f, 0.0f, 0.0f};
10831059
float DCADau = -999.f;
10841060
float CosPA = -1.f;
1085-
float OpAngle = -999.f;
1086-
float Eta() const {
1061+
float OpAngle = -999.f;
1062+
float Eta() const
1063+
{
10871064
return RecoDecay::eta(std::array{hyperonMomentum[0] + antiHyperonMomentum[0], hyperonMomentum[1] + antiHyperonMomentum[1], hyperonMomentum[2] + antiHyperonMomentum[2]});
10881065
}
1089-
float Phi() const {
1066+
float Phi() const
1067+
{
10901068
return RecoDecay::phi(std::array{hyperonMomentum[0] + antiHyperonMomentum[0], hyperonMomentum[1] + antiHyperonMomentum[1]});
10911069
}
10921070
};
@@ -1141,7 +1119,7 @@ struct QuarkoniaToHyperons {
11411119
TVector3 hyp2Momentum(pairInfo.antiHyperonMomentum[0], pairInfo.antiHyperonMomentum[1], pairInfo.antiHyperonMomentum[2]);
11421120
pairInfo.OpAngle = hyp1Momentum.Angle(hyp2Momentum);
11431121

1144-
if (d < 1e-5f) { // Parallel or nearly parallel lines
1122+
if (d < 1e-5f) { // Parallel or nearly parallel lines
11451123
pairInfo.X = pairInfo.Y = pairInfo.Z = -999.f; // should we use another dummy value? Perhaps 999.f?
11461124
return pairInfo;
11471125
}
@@ -1221,7 +1199,6 @@ struct QuarkoniaToHyperons {
12211199
return pairInfo;
12221200
}
12231201

1224-
12251202
template <typename TCollision>
12261203
bool isEventAccepted(TCollision collision, bool fillHists)
12271204
// check whether the collision passes our collision selections

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -283,47 +283,47 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_006, "AOD", "STRAEVSELS", 6, //!
283283
evsel::Sel8, evsel::Selection, //! event selection: sel8
284284
mult::MultFT0A, mult::MultFT0C, mult::MultFV0A, // FIT detectors
285285
mult::MultFDDA, mult::MultFDDC,
286-
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
287-
mult::MultPVTotalContributors, // number of PV contribs total
288-
mult::MultNTracksGlobal, // global track multiplicities
289-
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
290-
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
291-
evsel::Rct); // Bitmask of RCT flags
292-
293-
DECLARE_SOA_TABLE(StraEvSelExtras_000, "AOD", "STRAEVSELEXTRAS", //! debug information
294-
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
295-
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
296-
udcollision::TimeFDDA, // Average A-side time (ns)
297-
udcollision::TimeFDDC, // Average C-side time (ns)
298-
udcollision::TimeFV0A, // Average A-side time (ns)
299-
udcollision::TimeFT0A, // Average A-side time (ns)
300-
udcollision::TimeFT0C, // Average C-side time (ns)
301-
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
302-
303-
DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1, //! debug information
304-
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
286+
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
287+
mult::MultPVTotalContributors, // number of PV contribs total
288+
mult::MultNTracksGlobal, // global track multiplicities
289+
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
290+
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
291+
evsel::Rct); // Bitmask of RCT flags
292+
293+
DECLARE_SOA_TABLE(StraEvSelExtras_000, "AOD", "STRAEVSELEXTRAS", //! debug information
294+
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
295+
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
296+
udcollision::TimeFDDA, // Average A-side time (ns)
297+
udcollision::TimeFDDC, // Average C-side time (ns)
298+
udcollision::TimeFV0A, // Average A-side time (ns)
299+
udcollision::TimeFT0A, // Average A-side time (ns)
300+
udcollision::TimeFT0C, // Average C-side time (ns)
301+
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
302+
303+
DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1, //! debug information
304+
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
305305
mult::MultZEM2, mult::MultZPA, mult::MultZPC,
306-
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
307-
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
308-
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
309-
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
310-
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
311-
udcollision::TimeFDDA, // Average A-side time (ns)
312-
udcollision::TimeFDDC, // Average C-side time (ns)
313-
udcollision::TimeFV0A, // Average A-side time (ns)
314-
udcollision::TimeFT0A, // Average A-side time (ns)
315-
udcollision::TimeFT0C, // Average C-side time (ns)
316-
udcollision::TriggerMaskFT0, // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
317-
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
318-
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
319-
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
320-
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
321-
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
322-
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
323-
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
324-
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
325-
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
326-
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
306+
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
307+
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
308+
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
309+
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
310+
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
311+
udcollision::TimeFDDA, // Average A-side time (ns)
312+
udcollision::TimeFDDC, // Average C-side time (ns)
313+
udcollision::TimeFV0A, // Average A-side time (ns)
314+
udcollision::TimeFT0A, // Average A-side time (ns)
315+
udcollision::TimeFT0C, // Average C-side time (ns)
316+
udcollision::TriggerMaskFT0, // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
317+
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
318+
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
319+
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
320+
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
321+
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
322+
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
323+
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
324+
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
325+
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
326+
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
327327
// Dynamic columns for manipulating information
328328
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
329329
// stracollision::TotalFT0AmplitudeA<mult::MultFT0A>,
@@ -332,8 +332,7 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1,
332332
// stracollision::TotalFDDAmplitudeC<mult::MultFDDC>,
333333
// stracollision::EnergyCommonZNA<mult::MultZNA>,
334334
// stracollision::EnergyCommonZNC<mult::MultZNC>,
335-
stracollision::IsUPC<udcollision::GapSide>
336-
);
335+
stracollision::IsUPC<udcollision::GapSide>);
337336

338337
DECLARE_SOA_TABLE(StraEvSelsRun2, "AOD", "STRAEVSELSRUN2", //! debug information
339338
evsel::Sel8, evsel::Sel7, evsel::Selection, //! event selection: sel8

‎PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter2.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct straevselextrasconverter2 {
4343
-999., // dummy timeFV0A,
4444
-999., // dummy timeFT0A,
4545
-999., // dummy timeFT0C,
46-
0, // dummy triggerMaskFT0,
46+
0, // dummy triggerMaskFT0,
4747
-999, // dummy gapSide,
4848
-999., // dummy totalFT0AmplitudeA,
4949
-999., // dummy totalFT0AmplitudeC,

‎PWGLF/TableProducer/Strangeness/cascadeflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#include "Framework/O2DatabasePDGPlugin.h"
3434
#include "Framework/runDataProcessing.h"
3535

36+
#include "Math/GenVector/Boost.h"
3637
#include "Math/Vector3D.h"
3738
#include "Math/Vector4D.h"
38-
#include "Math/GenVector/Boost.h"
3939
#include "TRandom3.h"
4040

4141
#include <memory>

‎PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ struct strangederivedbuilder {
560560
products.strangeCents(collision.centFT0M(), collision.centFT0A(),
561561
centrality, collision.centFV0A(), collision.centFT0CVariant1(), collision.centFT0CVariant2(),
562562
collision.centMFT(), collision.centNGlobal(), collision.centNTPV());
563-
products.strangeEvSels(collision.sel8(), collision.selection_raw(),
563+
products.strangeEvSels(collision.sel8(), collision.selection_raw(),
564564
collision.multFT0A() * static_cast<float>(fillTruncationOptions.fillRawFT0A),
565565
collision.multFT0C() * static_cast<float>(fillTruncationOptions.fillRawFT0C),
566566
collision.multFV0A() * static_cast<float>(fillTruncationOptions.fillRawFV0A),
@@ -584,8 +584,8 @@ struct strangederivedbuilder {
584584
collision.multAllTracksITSTPC() * static_cast<int>(fillTruncationOptions.fillRawNTracksForCorrelation),
585585
collision.trackOccupancyInTimeRange(),
586586
collision.ft0cOccupancyInTimeRange(),
587-
timeFDDA, timeFDDC, // FDD info
588-
timeFV0A, // FV0A info
587+
timeFDDA, timeFDDC, // FDD info
588+
timeFV0A, // FV0A info
589589
timeFT0A, timeFT0C, ft0TriggerMask, // FT0 info
590590
// UPC info
591591
gapSide,

‎PWGLF/Tasks/QC/strderivedGenQA.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
2424
#include "PWGLF/DataModel/LFStrangenessTables.h"
2525

26+
#include "Common/CCDB/EventSelectionParams.h"
27+
#include "Common/CCDB/RCTSelectionFlags.h"
2628
#include "Common/Core/RecoDecay.h"
2729
#include "Common/Core/TrackSelection.h"
2830
#include "Common/Core/trackUtilities.h"
2931
#include "Common/DataModel/Centrality.h"
3032
#include "Common/DataModel/EventSelection.h"
3133
#include "Common/DataModel/TrackSelectionTables.h"
32-
#include "Common/CCDB/EventSelectionParams.h"
33-
#include "Common/CCDB/RCTSelectionFlags.h"
3434

3535
#include "CCDB/BasicCCDBManager.h"
3636
#include "CommonConstants/PhysicsConstants.h"

‎PWGLF/Tasks/Resonances/higherMassResonances.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
1818
#include "PWGLF/DataModel/LFStrangenessTables.h" //
1919

20+
#include "Common/CCDB/EventSelectionParams.h"
21+
#include "Common/CCDB/RCTSelectionFlags.h"
2022
#include "Common/Core/TrackSelection.h"
2123
#include "Common/Core/trackUtilities.h"
2224
#include "Common/DataModel/Centrality.h"
@@ -25,8 +27,6 @@
2527
#include "Common/DataModel/PIDResponseTOF.h" //
2628
#include "Common/DataModel/PIDResponseTPC.h" //
2729
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "Common/CCDB/EventSelectionParams.h"
29-
#include "Common/CCDB/RCTSelectionFlags.h"
3030

3131
#include "Framework/ASoAHelpers.h"
3232
#include "Framework/AnalysisDataModel.h"

0 commit comments

Comments
 (0)