Skip to content

Commit 3eb977b

Browse files
Shiqi WangShiqi Wang
authored andcommitted
Fix code-check issues in flow ESE task
1 parent a29f020 commit 3eb977b

1 file changed

Lines changed: 26 additions & 22 deletions

File tree

PWGCF/Flow/Tasks/flowEseTask.cxx

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct FlowEseTask {
8282
"http://alice-ccdb.cern.ch", "Address of the CCDB to browse"};
8383
Configurable<int64_t> ccdbNoLaterThan{"ccdbNoLaterThan", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "Latest acceptable timestamp of creation for the object"};
8484
} cfgCcdbParam;
85-
Service<o2::ccdb::BasicCCDBManager> ccdb;
85+
Service<o2::ccdb::BasicCCDBManager> ccdb{};
8686
o2::ccdb::CcdbApi ccdbApi;
8787

8888
Configurable<float> cfgCentSel{"cfgCentSel", 80., "Centrality selection"};
@@ -204,7 +204,7 @@ struct FlowEseTask {
204204

205205
int currentRunNumber = -999;
206206
int lastRunNumber = -999;
207-
std::vector<TProfile3D*> shiftprofile{};
207+
std::vector<TProfile3D*> shiftprofile;
208208
TProfile2D* effMap = nullptr;
209209
TProfile2D* accMap = nullptr;
210210

@@ -213,23 +213,25 @@ struct FlowEseTask {
213213
template <typename T>
214214
int getDetId(const T& name)
215215
{
216-
if (name.value == "FT0C") {
217-
return 0;
218-
} else if (name.value == "FT0A") {
216+
if (name.value == "FT0A") {
219217
return 1;
220-
} else if (name.value == "FT0M") {
218+
}
219+
if (name.value == "FT0M") {
221220
return 2;
222-
} else if (name.value == "FV0A") {
221+
}
222+
if (name.value == "FV0A") {
223223
return 3;
224-
} else if (name.value == "TPCpos") {
224+
}
225+
if (name.value == "TPCpos") {
225226
return 4;
226-
} else if (name.value == "TPCneg") {
227+
}
228+
if (name.value == "TPCneg") {
227229
return 5;
228-
} else if (name.value == "TPCall") {
230+
}
231+
if (name.value == "TPCall") {
229232
return 6;
230-
} else {
231-
return 0;
232233
}
234+
return 0;
233235
}
234236

235237
int q2CentBin(float cent) const
@@ -242,7 +244,7 @@ struct FlowEseTask {
242244

243245
const char* q2GroupSuffix(int group) const
244246
{
245-
static constexpr const char* Q2GroupSuffixes[] = {
247+
static constexpr std::array<const char*, NQ2Groups> Q2GroupSuffixes = {
246248
"q2p00_10", "q2p10_20", "q2p20_30", "q2p30_40", "q2p40_50",
247249
"q2p50_60", "q2p60_70", "q2p70_80", "q2p80_90", "q2p90_100"};
248250
if (group < 0 || group >= NQ2Groups) {
@@ -269,10 +271,10 @@ struct FlowEseTask {
269271
template <typename TCollision>
270272
double getQ2(TCollision const& collision)
271273
{
272-
if (cfgMultCor)
274+
if (cfgMultCor) {
273275
return std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * collision.sumAmplFT0C() / std::sqrt(collision.multFT0C());
274-
else
275-
return std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C());
276+
}
277+
return std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C());
276278
}
277279

278280
void init(o2::framework::InitContext&)
@@ -499,7 +501,7 @@ struct FlowEseTask {
499501
ROOT::Math::PxPyPzMVector protonVec, pionVec, LambdaVec, protonBoostedVec, pionBoostedVec;
500502

501503
template <typename TCollision>
502-
bool eventSelected(TCollision collision)
504+
bool eventSelected(TCollision const& collision)
503505
{
504506
if (!collision.sel8()) {
505507
return 0;
@@ -591,14 +593,16 @@ struct FlowEseTask {
591593

592594
double safeATan2(double y, double x)
593595
{
594-
if (x != 0)
596+
if (x != 0) {
595597
return std::atan2(y, x);
596-
if (y == 0)
598+
}
599+
if (y == 0) {
597600
return 0;
598-
if (y > 0)
601+
}
602+
if (y > 0) {
599603
return o2::constants::math::PIHalf;
600-
else
601-
return -o2::constants::math::PIHalf;
604+
}
605+
return -o2::constants::math::PIHalf;
602606
}
603607

604608
template <typename TrackType>

0 commit comments

Comments
 (0)