Skip to content

Commit 1aa81e9

Browse files
authored
Merge pull request #102 from alibuild/alibot-cleanup-17170
[PWGCF] Please consider the following formatting changes to #17170
2 parents 4f7dc3b + 91ed688 commit 1aa81e9

1 file changed

Lines changed: 15 additions & 19 deletions

File tree

PWGCF/Flow/TableProducer/zdcQVectors.cxx

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,11 @@ int counter = 0;
7171
// Energy calibration:
7272
const std::array<TString, 10> namesEcal = {{"hZNA_mean_t0_cent", "hZNA_mean_t1_cent", "hZNA_mean_t2_cent", "hZNA_mean_t3_cent", "hZNA_mean_t4_cent",
7373
"hZNC_mean_t0_cent", "hZNC_mean_t1_cent", "hZNC_mean_t2_cent", "hZNC_mean_t3_cent", "hZNC_mean_t4_cent"}};
74-
const std::array<std::array<TString, 4>, 5> names = {{
75-
{{"hQXA_mean_Cent_V_run", "hQYA_mean_Cent_V_run", "hQXC_mean_Cent_V_run", "hQYC_mean_Cent_V_run"}},
76-
{{"hQXA_mean_cent_run", "hQYA_mean_cent_run", "hQXC_mean_cent_run", "hQYC_mean_cent_run"}},
77-
{{"hQXA_mean_vx_run", "hQYA_mean_vx_run", "hQXC_mean_vx_run", "hQYC_mean_vx_run"}},
78-
{{"hQXA_mean_vy_run", "hQYA_mean_vy_run", "hQXC_mean_vy_run", "hQYC_mean_vy_run"}},
79-
{{"hQXA_mean_vz_run", "hQYA_mean_vz_run", "hQXC_mean_vz_run", "hQYC_mean_vz_run"}}
80-
}};
74+
const std::array<std::array<TString, 4>, 5> names = {{{{"hQXA_mean_Cent_V_run", "hQYA_mean_Cent_V_run", "hQXC_mean_Cent_V_run", "hQYC_mean_Cent_V_run"}},
75+
{{"hQXA_mean_cent_run", "hQYA_mean_cent_run", "hQXC_mean_cent_run", "hQYC_mean_cent_run"}},
76+
{{"hQXA_mean_vx_run", "hQYA_mean_vx_run", "hQXC_mean_vx_run", "hQYC_mean_vx_run"}},
77+
{{"hQXA_mean_vy_run", "hQYA_mean_vy_run", "hQXC_mean_vy_run", "hQYC_mean_vy_run"}},
78+
{{"hQXA_mean_vz_run", "hQYA_mean_vz_run", "hQXC_mean_vz_run", "hQYC_mean_vz_run"}}}};
8179
const std::array<TString, 4> namesTS = {{"hQXA_mean_timestamp_run", "hQYA_mean_timestamp_run", "hQXC_mean_timestamp_run", "hQYC_mean_timestamp_run"}}; // for timestamp recentering
8280
const std::array<TString, 2> vnames = {"hvertex_vx", "hvertex_vy"};
8381

@@ -200,13 +198,13 @@ struct ZdcQVectors {
200198
TProfile3D* shiftprofileA = nullptr;
201199
bool isShiftProfileFound = false;
202200

203-
int lastRunNumber = 0;
204-
int runnumber = 0;
201+
int lastRunNumber = 0;
202+
int runnumber = 0;
205203
float centrality = 0;
206204
double rsTimestamp = 0;
207-
uint64_t timestamp = 0;
205+
uint64_t timestamp = 0;
208206
std::vector<float> v = {0, 0, 0};
209-
bool isSelected = 0;
207+
bool isSelected = 0;
210208
} cal;
211209

212210
enum FillType {
@@ -513,7 +511,7 @@ struct ZdcQVectors {
513511
}
514512

515513
template <FillType ft>
516-
inline void fillCommonRegistry(double qxa, double qya, double qxc, double qyc, std::vector<float> v, double centrality, double rsTimestamp)
514+
inline void fillCommonRegistry(double qxa, double qya, double qxc, double qyc, std::vector<float> v, double centrality, double rsTimestamp)
517515
{
518516
// loop for filling multiple histograms with different naming patterns
519517
// Always fill the uncentered "raw" Q-vector histos!
@@ -736,11 +734,10 @@ struct ZdcQVectors {
736734
std::vector<float> v = {collision.posX(), collision.posY(), collision.posZ()};
737735
cal.v = v;
738736

739-
740737
const auto& foundBC = collision.foundBC_as<BCsRun3>();
741738
auto runnumber = foundBC.runNumber();
742739
cal.runnumber = runnumber;
743-
cal.centrality = cent;
740+
cal.centrality = cent;
744741

745742
if (cfgFillHistRegistry && !cfgFillNothing) {
746743
registry.fill(HIST("QA/centrality_before"), cent);
@@ -767,11 +764,10 @@ struct ZdcQVectors {
767764
int nTowers = 8;
768765
int nTowersPerSide = 4;
769766

770-
// for energy calibration
767+
// for energy calibration
771768
std::array<double, 8> eZN; // uncalibrated energy for the 2x4 towers (a1, a2, a3, a4, c1, c2, c3, c4)
772769
std::array<double, 10> meanEZN; // mean energies from calibration histos (common A, t1-4 A,common C, t1-4C)
773-
std::array<double, 8> e; // calibrated energies (a1, a2, a3, a4, c1, c2, c3, c4))
774-
770+
std::array<double, 8> e; // calibrated energies (a1, a2, a3, a4, c1, c2, c3, c4))
775771

776772
for (int tower = 0; tower < nTowers; tower++) {
777773
eZN[tower] = (tower < nTowersPerSide) ? zdcCol.energySectorZNA()[tower] : zdcCol.energySectorZNC()[tower % nTowersPerSide];
@@ -967,7 +963,7 @@ struct ZdcQVectors {
967963
loadCalibrations<kTimestamp>(extraTS.cfgCCDBdir_Timestamp.value, timestamp);
968964
}
969965

970-
std::array<double,4> qRec(q);
966+
std::array<double, 4> qRec(q);
971967

972968
if (cal.atIteration == 0) {
973969
if (cal.isSelected && cfgFillHistRegistry && isEventSelected)
@@ -1142,7 +1138,7 @@ struct ZdcQVectors {
11421138
}
11431139

11441140
spTableZDC(runnumber, cents, v, foundBC.timestamp(), qXaShift, qYaShift, qXcShift, qYcShift, cal.isSelected, eventSelectionFlags);
1145-
qRec = {0,0,0,0};
1141+
qRec = {0, 0, 0, 0};
11461142

11471143
cal.lastRunNumber = runnumber;
11481144
return;

0 commit comments

Comments
 (0)