Skip to content

Commit 35158c4

Browse files
kegang02kegang02
authored
Merge pull request #4 from alibuild/alibot-cleanup-15435
Please consider the following formatting changes to #15435
2 parents d899887 + 4526313 commit 35158c4

File tree

1 file changed

+31
-32
lines changed

1 file changed

+31
-32
lines changed

‎PWGCF/Flow/Tasks/flowZdcEnergy.cxx‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,26 @@
2424
#include "Framework/RunningWorkflowInfo.h"
2525
#include "Framework/runDataProcessing.h"
2626

27+
#include <chrono>
2728
#include <cmath>
2829
#include <cstdint>
29-
#include <chrono>
3030

3131
using namespace o2;
3232
using namespace o2::framework;
3333

34-
#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{ #NAME, DEFAULT, HELP };
34+
#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
3535

3636
struct flowZdcEnergy {
3737

3838
struct : ConfigurableGroup{
39-
O2_DEFINE_CONFIGURABLE(cfgCentMin, float, 0.f, "Minimum centrality for selected events")
40-
O2_DEFINE_CONFIGURABLE(cfgCentMax, float, 90.f, "Maximum centrality for selected events")
41-
O2_DEFINE_CONFIGURABLE(cfgVtxZ, float, 10.f, "Accepted z-vertex range")
42-
} evsel;
39+
O2_DEFINE_CONFIGURABLE(cfgCentMin, float, 0.f, "Minimum centrality for selected events")
40+
O2_DEFINE_CONFIGURABLE(cfgCentMax, float, 90.f, "Maximum centrality for selected events")
41+
O2_DEFINE_CONFIGURABLE(cfgVtxZ, float, 10.f, "Accepted z-vertex range")} evsel;
4342

44-
ConfigurableAxis axisCent{ "axisCent", { 90, 0, 90 }, "Centrality (%)" };
45-
ConfigurableAxis axisMult{ "axisMult", { 100, 0, 100000 }, "Multiplicity" };
46-
ConfigurableAxis axisEnergy{ "axisEnergy", { 300, 0, 300 }, "Energy" };
47-
ConfigurableAxis axisRescaledDiff{ "axisRescaledDiff", { 400, -1, 1 }, "(EA-EC)/(EA+EC)" };
43+
ConfigurableAxis axisCent{"axisCent", {90, 0, 90}, "Centrality (%)"};
44+
ConfigurableAxis axisMult{"axisMult", {100, 0, 100000}, "Multiplicity"};
45+
ConfigurableAxis axisEnergy{"axisEnergy", {300, 0, 300}, "Energy"};
46+
ConfigurableAxis axisRescaledDiff{"axisRescaledDiff", {400, -1, 1}, "(EA-EC)/(EA+EC)"};
4847

4948
// Event counter bins
5049
enum SelectionCriteria : uint8_t {
@@ -58,7 +57,7 @@ struct flowZdcEnergy {
5857
};
5958

6059
Service<ccdb::BasicCCDBManager> ccdb;
61-
HistogramRegistry registry{ "registry" };
60+
HistogramRegistry registry{"registry"};
6261

6362
// Run 3
6463
using CollisionsRun3 = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>;
@@ -78,7 +77,7 @@ struct flowZdcEnergy {
7877
.count();
7978
ccdb->setCreatedNotAfter(now);
8079

81-
registry.add("hEventCount", "Event counter;Selection;Events", { HistType::kTH1D, { { kNSelections, 0, kNSelections } } });
80+
registry.add("hEventCount", "Event counter;Selection;Events", {HistType::kTH1D, {{kNSelections, 0, kNSelections}}});
8281
auto hCount = registry.get<TH1>(HIST("hEventCount"));
8382
hCount->GetXaxis()->SetBinLabel(kAllEvents + 1, "All events");
8483
hCount->GetXaxis()->SetBinLabel(kSeln + 1, "Sel7/8");
@@ -87,23 +86,23 @@ struct flowZdcEnergy {
8786
hCount->GetXaxis()->SetBinLabel(kBCHasZDC + 1, "BC has ZDC");
8887
hCount->GetXaxis()->SetBinLabel(kSelectedZDC + 1, "Selected ZDC");
8988

90-
registry.add("hCentrality", "", { HistType::kTH1D, { axisCent } });
91-
registry.add("hMultiplicity", "", { HistType::kTH1D, { axisMult } });
92-
93-
registry.add("hEnergyWithCent_ZNA_Common", "", { HistType::kTH2D, { axisEnergy, axisCent } });
94-
registry.add("hEnergyWithCent_ZNC_Common", "", { HistType::kTH2D, { axisEnergy, axisCent } });
95-
registry.add("hEnergyWithCent_RescaledDiff", "", { HistType::kTH2D, { axisRescaledDiff, axisCent } });
96-
registry.add("hEnergyWithCent_ZNA_1", "", { HistType::kTH2D, { axisEnergy, axisCent } });
97-
registry.add("hEnergyWithCent_ZNA_2", "", { HistType::kTH2D, { axisEnergy, axisCent } });
98-
registry.add("hEnergyWithCent_ZNA_3", "", { HistType::kTH2D, { axisEnergy, axisCent } });
99-
registry.add("hEnergyWithCent_ZNA_4", "", { HistType::kTH2D, { axisEnergy, axisCent } });
100-
registry.add("hEnergyWithCent_ZNC_1", "", { HistType::kTH2D, { axisEnergy, axisCent } });
101-
registry.add("hEnergyWithCent_ZNC_2", "", { HistType::kTH2D, { axisEnergy, axisCent } });
102-
registry.add("hEnergyWithCent_ZNC_3", "", { HistType::kTH2D, { axisEnergy, axisCent } });
103-
registry.add("hEnergyWithCent_ZNC_4", "", { HistType::kTH2D, { axisEnergy, axisCent } });
104-
registry.add("hEnergyWithCent_ZNA_SumSectors", "", { HistType::kTH2D, { axisEnergy, axisCent } });
105-
registry.add("hEnergyWithCent_ZNC_SumSectors", "", { HistType::kTH2D, { axisEnergy, axisCent } });
106-
registry.add("hEnergyWithCent_RescaledSumDiff", "", { HistType::kTH2D, { axisRescaledDiff, axisCent } });
89+
registry.add("hCentrality", "", {HistType::kTH1D, {axisCent}});
90+
registry.add("hMultiplicity", "", {HistType::kTH1D, {axisMult}});
91+
92+
registry.add("hEnergyWithCent_ZNA_Common", "", {HistType::kTH2D, {axisEnergy, axisCent}});
93+
registry.add("hEnergyWithCent_ZNC_Common", "", {HistType::kTH2D, {axisEnergy, axisCent}});
94+
registry.add("hEnergyWithCent_RescaledDiff", "", {HistType::kTH2D, {axisRescaledDiff, axisCent}});
95+
registry.add("hEnergyWithCent_ZNA_1", "", {HistType::kTH2D, {axisEnergy, axisCent}});
96+
registry.add("hEnergyWithCent_ZNA_2", "", {HistType::kTH2D, {axisEnergy, axisCent}});
97+
registry.add("hEnergyWithCent_ZNA_3", "", {HistType::kTH2D, {axisEnergy, axisCent}});
98+
registry.add("hEnergyWithCent_ZNA_4", "", {HistType::kTH2D, {axisEnergy, axisCent}});
99+
registry.add("hEnergyWithCent_ZNC_1", "", {HistType::kTH2D, {axisEnergy, axisCent}});
100+
registry.add("hEnergyWithCent_ZNC_2", "", {HistType::kTH2D, {axisEnergy, axisCent}});
101+
registry.add("hEnergyWithCent_ZNC_3", "", {HistType::kTH2D, {axisEnergy, axisCent}});
102+
registry.add("hEnergyWithCent_ZNC_4", "", {HistType::kTH2D, {axisEnergy, axisCent}});
103+
registry.add("hEnergyWithCent_ZNA_SumSectors", "", {HistType::kTH2D, {axisEnergy, axisCent}});
104+
registry.add("hEnergyWithCent_ZNC_SumSectors", "", {HistType::kTH2D, {axisEnergy, axisCent}});
105+
registry.add("hEnergyWithCent_RescaledSumDiff", "", {HistType::kTH2D, {axisRescaledDiff, axisCent}});
107106
}
108107

109108
// Helper: event selection
@@ -229,6 +228,6 @@ struct flowZdcEnergy {
229228
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
230229
{
231230
return WorkflowSpec{
232-
adaptAnalysisTask<flowZdcEnergy>(cfgc)
233-
};
234-
}
231+
adaptAnalysisTask<flowZdcEnergy>(cfgc)};
232+
}
233+

0 commit comments

Comments
 (0)