Skip to content

Commit 53de17a

Browse files
wenyaCernwenyaCern
authored
Merge pull request #1 from alibuild/alibot-cleanup-12690
Please consider the following formatting changes to AliceO2Group#12690
2 parents 975893a + 7aa1ab3 commit 53de17a

18 files changed

+271
-249
lines changed

‎PWGCF/Femto/Core/FemtoFlowAngularContainer.h‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,20 @@
2020
#ifndef PWGCF_FEMTOFLOW_CORE_FEMTOFLOWANGULARCONTAINER_H_
2121
#define PWGCF_FEMTOFLOW_CORE_FEMTOFLOWANGULARCONTAINER_H_
2222

23-
#include <fairlogger/Logger.h>
24-
#include <vector>
25-
#include <string>
23+
#include "PWGCF/Femto/Core/FemtoFlowMath.h"
2624

27-
#include "Framework/HistogramRegistry.h"
2825
#include "Common/Core/RecoDecay.h"
29-
#include "PWGCF/Femto/Core/FemtoFlowMath.h"
26+
27+
#include "Framework/HistogramRegistry.h"
3028

3129
#include "Math/Vector4D.h"
32-
#include "TMath.h"
3330
#include "TDatabasePDG.h"
31+
#include "TMath.h"
32+
33+
#include <fairlogger/Logger.h>
34+
35+
#include <string>
36+
#include <vector>
3437

3538
using namespace o2::framework;
3639

@@ -231,7 +234,7 @@ class FemtoFlowAngularContainer
231234
protected:
232235
HistogramRegistry* mHistogramRegistry = nullptr; ///< For QA output
233236
static constexpr std::string_view FolderSuffix[2] = {"SameEvent", "MixedEvent"}; ///< Folder naming for the output according to EventType
234-
static constexpr femto_flow_angular_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_angular_container::Observable)
237+
static constexpr femto_flow_angular_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_angular_container::Observable)
235238
static constexpr int EventType = eventType; ///< Type of the event (same/mixed, according to femto_flow_angular_container::EventType)
236239
float mMassOne = 0.f; ///< PDG mass of particle 1
237240
float mMassTwo = 0.f; ///< PDG mass of particle 2

‎PWGCF/Femto/Core/FemtoFlowCollisionSelection.h‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
#ifndef PWGCF_FEMTOFLOW_CORE_FEMTOFLOWCOLLISIONSELECTION_H_
1818
#define PWGCF_FEMTOFLOW_CORE_FEMTOFLOWCOLLISIONSELECTION_H_
1919

20-
#include <string>
2120
#include "Common/CCDB/TriggerAliases.h"
21+
#include "Common/Core/EventPlaneHelper.h"
22+
#include "Common/DataModel/Qvectors.h"
23+
2224
#include "Framework/HistogramRegistry.h"
2325
#include "Framework/Logger.h"
2426

25-
#include "Common/Core/EventPlaneHelper.h"
26-
#include "Common/DataModel/Qvectors.h"
27+
#include <string>
2728

2829
using namespace o2;
2930
using namespace o2::framework;
@@ -143,7 +144,7 @@ class FemtoFlowCollisionSelection
143144
/// \param col Collision
144145
template <typename T>
145146
void fillQA(T const& col)
146-
{
147+
{
147148

148149
if (mHistogramRegistry) {
149150
mHistogramRegistry->fill(HIST("Event/zvtxhist"), col.posZ());
@@ -212,32 +213,34 @@ class FemtoFlowCollisionSelection
212213
return spher;
213214
}
214215

215-
//Qn-vector calculation
216+
// Qn-vector calculation
216217
template <typename T>
217218
float computeqnVec(T const& col)
218219
{
219220
double qn = std::sqrt(col.qvecFT0CReVec()[0] * col.qvecFT0CReVec()[0] + col.qvecFT0CImVec()[0] * col.qvecFT0CImVec()[0]) * std::sqrt(col.sumAmplFT0C());
220-
if (mHistogramRegistry){
221-
mHistogramRegistry->fill(HIST("Event/qnvector"), col.centFT0C(), qn);
222-
mHistogramRegistry->fill(HIST("Event/SphrVsqn"), qn, mSphericity);
221+
if (mHistogramRegistry) {
222+
mHistogramRegistry->fill(HIST("Event/qnvector"), col.centFT0C(), qn);
223+
mHistogramRegistry->fill(HIST("Event/SphrVsqn"), qn, mSphericity);
223224
}
224225
return qn;
225226
}
226227

227-
//Qn-vector calculation
228+
// Qn-vector calculation
228229
template <typename T>
229-
int myqnBin(T const& col, float centBinLength=10.f)
230-
{
230+
int myqnBin(T const& col, float centBinLength = 10.f)
231+
{
231232
int qnBin = -999;
232233
float qn = computeqnVec(col);
233234
int mycentBin = (int)(col.centFT0C() / centBinLength);
234-
if (mycentBin >= (int)(mCentMax / centBinLength)) return qnBin;
235+
if (mycentBin >= (int)(mCentMax / centBinLength))
236+
return qnBin;
235237

236-
for (int iqn(0); iqn < static_cast<int>(std::size(mqnBinSeparator[mycentBin]))-1; ++iqn){
237-
if (qn>mqnBinSeparator[mycentBin][iqn] && qn<=mqnBinSeparator[mycentBin][iqn+1]){
238+
for (int iqn(0); iqn < static_cast<int>(std::size(mqnBinSeparator[mycentBin])) - 1; ++iqn) {
239+
if (qn > mqnBinSeparator[mycentBin][iqn] && qn <= mqnBinSeparator[mycentBin][iqn + 1]) {
238240
qnBin = iqn;
239241
break;
240-
}else continue;
242+
} else
243+
continue;
241244
}
242245

243246
return qnBin;
@@ -254,14 +257,13 @@ class FemtoFlowCollisionSelection
254257
float mCentMin = 0.0; ///< Minimum centrality value
255258
float mCentMax = 100.0; ///< Maximum centrality value
256259
float mSphericity = 2.;
257-
float mqnBinSeparator [7][11] = {{ 0.0, 63.50, 92.50, 116.50, 139.50, 162.50, 185.50, 212.50, 245.50, 292.50, 877.50},
258-
{ 0.0, 57.50, 82.50, 102.50, 121.50, 139.50, 158.50, 178.50, 203.50, 238.50, 616.50},
259-
{ 0.0, 49.50, 70.50, 86.50, 102.50, 116.50, 131.50, 148.50, 168.50, 195.50, 483.50},
260-
{ 0.0, 38.50, 55.50, 69.50, 82.50, 94.50, 106.50, 120.50, 137.50, 160.50, 375.50},
261-
{ 0.0, 29.50, 42.50, 53.50, 63.50, 73.50, 83.50, 95.50, 109.50, 128.50, 322.50},
262-
{ 0.0, 21.50, 31.50, 39.50, 47.50, 55.50, 63.50, 72.50, 83.50, 99.50, 266.50},
263-
{ 0.0, 15.50, 22.50, 28.50, 33.50, 39.50, 45.50, 52.50, 60.50, 72.50, 232.50}
264-
}; ///< qn bin edge from qn vector distributions, for per 10% centrality, 0-70%
260+
float mqnBinSeparator[7][11] = {{0.0, 63.50, 92.50, 116.50, 139.50, 162.50, 185.50, 212.50, 245.50, 292.50, 877.50},
261+
{0.0, 57.50, 82.50, 102.50, 121.50, 139.50, 158.50, 178.50, 203.50, 238.50, 616.50},
262+
{0.0, 49.50, 70.50, 86.50, 102.50, 116.50, 131.50, 148.50, 168.50, 195.50, 483.50},
263+
{0.0, 38.50, 55.50, 69.50, 82.50, 94.50, 106.50, 120.50, 137.50, 160.50, 375.50},
264+
{0.0, 29.50, 42.50, 53.50, 63.50, 73.50, 83.50, 95.50, 109.50, 128.50, 322.50},
265+
{0.0, 21.50, 31.50, 39.50, 47.50, 55.50, 63.50, 72.50, 83.50, 99.50, 266.50},
266+
{0.0, 15.50, 22.50, 28.50, 33.50, 39.50, 45.50, 52.50, 60.50, 72.50, 232.50}}; ///< qn bin edge from qn vector distributions, for per 10% centrality, 0-70%
265267
};
266268
} // namespace o2::analysis::femto_flow
267269

‎PWGCF/Femto/Core/FemtoFlowContainer.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ class FemtoFlowContainer
9393
mHistogramRegistry->add((folderName + "/relPairkstarmTMult").c_str(), ("; " + femtoObs + "; #it{m}_{T} (GeV/#it{c}^{2}); Multiplicity").c_str(), kTH3F, {femtoObsAxis, mTAxis3D, multAxis3D});
9494
}
9595

96-
if (useqnDivide){
97-
for (int iqn(0); iqn<numqnBins; ++iqn){
96+
if (useqnDivide) {
97+
for (int iqn(0); iqn < numqnBins; ++iqn) {
9898
mHistogramRegistry->add((folderName + std::to_string(iqn) + "/relPairDist").c_str(), ("; " + femtoObs + "; Entries").c_str(), kTH1F, {femtoObsAxis});
9999
mHistogramRegistry->add((folderName + std::to_string(iqn) + "/relPairkstarmT").c_str(), ("; " + femtoObs + "; #it{m}_{T} (GeV/#it{c}^{2})").c_str(), kTH2F, {femtoObsAxis, mTAxis});
100100
}
@@ -208,9 +208,9 @@ class FemtoFlowContainer
208208
mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + HIST(o2::aod::femtoflow_mc_particle::MCTypeName[mc]) + HIST("/relPairkstarmTMult"), femtoObs, mT, mult, weight);
209209
}
210210

211-
if (useqnDivide && mybinNum < numqnBins && mybinNum>=0) {
211+
if (useqnDivide && mybinNum < numqnBins && mybinNum >= 0) {
212212
mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + std::to_string(mybinNum) + HIST(o2::aod::femtoflow_mc_particle::MCTypeName[mc]) + HIST("/relPairDist"), femtoObs, weight);
213-
mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + std::to_string(mybinNum) + HIST(o2::aod::femtoflow_mc_particle::MCTypeName[mc]) + HIST("/relPairkstarmT"), femtoObs, mT, weight);
213+
mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + std::to_string(mybinNum) + HIST(o2::aod::femtoflow_mc_particle::MCTypeName[mc]) + HIST("/relPairkstarmT"), femtoObs, mT, weight);
214214
}
215215
}
216216

@@ -287,7 +287,7 @@ class FemtoFlowContainer
287287
protected:
288288
HistogramRegistry* mHistogramRegistry = nullptr; ///< For QA output
289289
static constexpr std::string_view FolderSuffix[2] = {"SameEvent", "MixedEvent"}; ///< Folder naming for the output according to EventType
290-
static constexpr femto_flow_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_container::Observable)
290+
static constexpr femto_flow_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_container::Observable)
291291
static constexpr int EventType = eventType; ///< Type of the event (same/mixed, according to femto_flow_container::EventType)
292292
float mMassOne = 0.f; ///< PDG mass of particle 1
293293
float mMassTwo = 0.f; ///< PDG mass of particle 2

‎PWGCF/Femto/Core/FemtoFlowCutculator.h‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@
1818
#ifndef PWGCF_FEMTOFLOW_CORE_FEMTOFLOWCUTCULATOR_H_
1919
#define PWGCF_FEMTOFLOW_CORE_FEMTOFLOWCUTCULATOR_H_
2020

21+
#include "PWGCF/Femto/Core/FemtoFlowSelection.h"
22+
#include "PWGCF/Femto/Core/FemtoFlowTrackSelection.h"
23+
24+
#include <boost/property_tree/json_parser.hpp>
25+
#include <boost/property_tree/ptree.hpp>
26+
27+
#include <algorithm>
2128
#include <bitset>
2229
#include <iostream>
30+
#include <iterator>
2331
#include <random>
2432
#include <string>
2533
#include <vector>
26-
#include <algorithm>
27-
#include <iterator>
28-
#include <boost/property_tree/json_parser.hpp>
29-
#include <boost/property_tree/ptree.hpp>
30-
31-
#include "PWGCF/Femto/Core/FemtoFlowSelection.h"
32-
#include "PWGCF/Femto/Core/FemtoFlowTrackSelection.h"
3334
// #include "PWGCF/Femto/Core/FemtoFlowV0Selection.h"
3435

3536
namespace o2::analysis::femto_flow
@@ -311,7 +312,7 @@ class FemtoFlowCutculator
311312
{
312313
aod::femtoflowparticle::CutContainerType output = -1;
313314
// if (choice == std::string("T")) {
314-
output = iterateSelection(mTrackSel, SysChecks, sign);
315+
output = iterateSelection(mTrackSel, SysChecks, sign);
315316
// } else if (choice == std::string("V")) {
316317
// output = iterateSelection(mV0Sel, SysChecks, sign);
317318
// } else {
@@ -353,7 +354,7 @@ class FemtoFlowCutculator
353354
FemtoFlowTrackSelection
354355
mTrackSel; ///< for setting up the bit-wise selection container for tracks
355356
// FemtoFlowV0Selection
356-
// mV0Sel; ///< for setting up the bit-wise selection container for V0s
357+
// mV0Sel; ///< for setting up the bit-wise selection container for V0s
357358
std::vector<o2::track::PID::ID>
358359
mPIDspecies; ///< list of particle species for which PID is stored
359360
std::vector<float>

‎PWGCF/Femto/Core/FemtoFlowDetaDphiStar.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@
1919
#ifndef PWGCF_FEMTOFLOW_CORE_FEMTOFLOWDETADPHISTAR_H_
2020
#define PWGCF_FEMTOFLOW_CORE_FEMTOFLOWDETADPHISTAR_H_
2121

22+
#include "PWGCF/Femto/Core/FemtoFlowAngularContainer.h"
23+
#include "PWGCF/Femto/Core/FemtoFlowFemtoContainer.h"
24+
#include "PWGCF/Femto/DataModel/FemtoDerived.h"
25+
26+
#include "TMath.h"
27+
2228
#include <memory>
2329
#include <string>
2430
#include <vector>
25-
#include "TMath.h"
26-
#include "PWGCF/Femto/DataModel/FemtoDerived.h"
27-
#include "PWGCF/Femto/Core/FemtoFlowFemtoContainer.h"
28-
#include "PWGCF/Femto/Core/FemtoFlowAngularContainer.h"
2931
// #include "PWGCF/Femto/Core/FemtoFlowContainer.h"
30-
#include "Framework/HistogramRegistry.h"
3132
#include "PWGCF/Femto/Core/FemtoFlowTrackSelection.h"
3233

34+
#include "Framework/HistogramRegistry.h"
35+
3336
namespace o2::analysis
3437
{
3538
namespace femto_flow

‎PWGCF/Femto/Core/FemtoFlowEventHisto.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define PWGCF_FEMTOUFLOW_CORE_FEMTOUFLOWEVENTHISTO_H_
1919

2020
#include "PWGCF/Femto/DataModel/FemtoDerived.h"
21+
2122
#include "Framework/HistogramRegistry.h"
2223

2324
using namespace o2::framework;

0 commit comments

Comments
 (0)