Skip to content

Commit ba2dbad

Browse files
wenyaCernwenyaCern
committed
fix bug in mega lint
1 parent b5d848c commit ba2dbad

File tree

3 files changed

+13
-109
lines changed

3 files changed

+13
-109
lines changed

‎PWGCF/Femto/Core/FemtoFlowCollisionSelection.h‎

Lines changed: 1 addition & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ class FemtoFlowCollisionSelection
263263
float mCentMax = 98.0; ///< Maximum centrality value
264264
float mSphericity = 2.;
265265
float mqnBinSeparator[98][11] = {
266-
<<<<<<< HEAD
267266
{0.50, 68.50, 100.50, 126.50, 151.50, 176.50, 203.50, 232.50, 269.50, 322.50, 833.50}, // cent 0 to 1
268267
{0.50, 66.50, 97.50, 122.50, 147.50, 171.50, 197.50, 226.50, 261.50, 313.50, 821.50}, // cent 1 to 2
269268
{0.50, 65.50, 95.50, 120.50, 144.50, 168.50, 193.50, 221.50, 256.50, 307.50, 876.50}, // cent 2 to 3
@@ -362,108 +361,7 @@ class FemtoFlowCollisionSelection
362361
{0.50, 3.50, 5.50, 6.50, 8.50, 9.50, 10.50, 12.50, 14.50, 16.50, 55.50}, // cent 95 to 96
363362
{0.50, 3.50, 5.50, 6.50, 7.50, 8.50, 10.50, 11.50, 13.50, 15.50, 54.50}, // cent 96 to 97
364363
{0.50, 3.50, 4.50, 5.50, 6.50, 7.50, 9.50, 10.50, 11.50, 13.50, 44.50} // cent 97 to 98
365-
}; ///< qn bin edge from qn vector distributions, for per 10% centrality, 0-60%
366-
=======
367-
{0.50, 68.50, 100.50, 126.50, 151.50, 176.50, 203.50, 232.50, 269.50, 322.50, 833.50}, // cent 0 to 1
368-
{0.50, 66.50, 97.50, 122.50, 147.50, 171.50, 197.50, 226.50, 261.50, 313.50, 821.50}, // cent 1 to 2
369-
{0.50, 65.50, 95.50, 120.50, 144.50, 168.50, 193.50, 221.50, 256.50, 307.50, 876.50}, // cent 2 to 3
370-
{0.50, 64.50, 93.50, 118.50, 141.50, 165.50, 190.50, 217.50, 251.50, 300.50, 836.50}, // cent 3 to 4
371-
{0.50, 63.50, 92.50, 116.50, 139.50, 162.50, 186.50, 214.50, 247.50, 294.50, 732.50}, // cent 4 to 5
372-
{0.50, 62.50, 91.50, 115.50, 137.50, 160.50, 183.50, 210.50, 242.50, 288.50, 692.50}, // cent 5 to 6
373-
{0.50, 62.50, 90.50, 114.50, 136.50, 158.50, 181.50, 207.50, 238.50, 283.50, 696.50}, // cent 6 to 7
374-
{0.50, 61.50, 89.50, 113.50, 134.50, 156.50, 178.50, 203.50, 233.50, 277.50, 681.50}, // cent 7 to 8
375-
{0.50, 61.50, 88.50, 111.50, 133.50, 154.50, 176.50, 200.50, 229.50, 271.50, 648.50}, // cent 8 to 9
376-
{0.50, 61.50, 88.50, 110.50, 131.50, 152.50, 173.50, 197.50, 225.50, 265.50, 616.50}, // cent 9 to 10
377-
{0.50, 60.50, 87.50, 109.50, 129.50, 149.50, 170.50, 193.50, 221.50, 260.50, 615.50}, // cent 10 to 11
378-
{0.50, 59.50, 86.50, 108.50, 128.50, 147.50, 168.50, 190.50, 217.50, 254.50, 586.50}, // cent 11 to 12
379-
{0.50, 59.50, 85.50, 106.50, 126.50, 145.50, 165.50, 187.50, 213.50, 249.50, 583.50}, // cent 12 to 13
380-
{0.50, 58.50, 84.50, 105.50, 124.50, 143.50, 162.50, 183.50, 209.50, 244.50, 542.50}, // cent 13 to 14
381-
{0.50, 58.50, 83.50, 104.50, 122.50, 141.50, 160.50, 180.50, 205.50, 239.50, 544.50}, // cent 14 to 15
382-
{0.50, 57.50, 82.50, 102.50, 120.50, 138.50, 157.50, 177.50, 201.50, 234.50, 534.50}, // cent 15 to 16
383-
{0.50, 56.50, 81.50, 101.50, 119.50, 136.50, 154.50, 174.50, 197.50, 230.50, 530.50}, // cent 16 to 17
384-
{0.50, 56.50, 80.50, 99.50, 117.50, 134.50, 151.50, 170.50, 193.50, 225.50, 508.50}, // cent 17 to 18
385-
{0.50, 55.50, 78.50, 98.50, 115.50, 132.50, 149.50, 167.50, 190.50, 221.50, 478.50}, // cent 18 to 19
386-
{0.50, 54.50, 77.50, 96.50, 113.50, 129.50, 146.50, 164.50, 186.50, 216.50, 508.50}, // cent 19 to 20
387-
{0.50, 53.50, 76.50, 94.50, 111.50, 127.50, 143.50, 161.50, 183.50, 212.50, 482.50}, // cent 20 to 21
388-
{0.50, 52.50, 75.50, 93.50, 109.50, 125.50, 141.50, 158.50, 179.50, 208.50, 468.50}, // cent 21 to 22
389-
{0.50, 51.50, 73.50, 91.50, 107.50, 122.50, 138.50, 155.50, 176.50, 204.50, 436.50}, // cent 22 to 23
390-
{0.50, 50.50, 72.50, 89.50, 105.50, 120.50, 136.50, 152.50, 172.50, 200.50, 440.50}, // cent 23 to 24
391-
{0.50, 49.50, 71.50, 88.50, 103.50, 118.50, 133.50, 149.50, 169.50, 196.50, 441.50}, // cent 24 to 25
392-
{0.50, 48.50, 69.50, 86.50, 101.50, 115.50, 130.50, 146.50, 166.50, 193.50, 412.50}, // cent 25 to 26
393-
{0.50, 47.50, 68.50, 84.50, 99.50, 113.50, 128.50, 144.50, 162.50, 189.50, 410.50}, // cent 26 to 27
394-
{0.50, 46.50, 66.50, 82.50, 97.50, 111.50, 125.50, 141.50, 159.50, 185.50, 409.50}, // cent 27 to 28
395-
{0.50, 46.50, 65.50, 81.50, 95.50, 109.50, 123.50, 138.50, 156.50, 182.50, 405.50}, // cent 28 to 29
396-
{0.50, 44.50, 63.50, 79.50, 93.50, 106.50, 120.50, 135.50, 153.50, 178.50, 392.50}, // cent 29 to 30
397-
{0.50, 43.50, 62.50, 77.50, 91.50, 104.50, 118.50, 132.50, 150.50, 174.50, 367.50}, // cent 30 to 31
398-
{0.50, 42.50, 61.50, 75.50, 89.50, 102.50, 115.50, 130.50, 147.50, 171.50, 368.50}, // cent 31 to 32
399-
{0.50, 41.50, 59.50, 74.50, 87.50, 100.50, 113.50, 127.50, 144.50, 168.50, 371.50}, // cent 32 to 33
400-
{0.50, 40.50, 58.50, 72.50, 85.50, 97.50, 110.50, 124.50, 141.50, 164.50, 369.50}, // cent 33 to 34
401-
{0.50, 39.50, 56.50, 70.50, 83.50, 95.50, 108.50, 121.50, 138.50, 161.50, 363.50}, // cent 34 to 35
402-
{0.50, 38.50, 55.50, 69.50, 81.50, 93.50, 105.50, 119.50, 135.50, 158.50, 353.50}, // cent 35 to 36
403-
{0.50, 37.50, 54.50, 67.50, 79.50, 91.50, 103.50, 116.50, 132.50, 154.50, 333.50}, // cent 36 to 37
404-
{0.50, 36.50, 52.50, 65.50, 77.50, 89.50, 101.50, 114.50, 129.50, 151.50, 333.50}, // cent 37 to 38
405-
{0.50, 35.50, 51.50, 64.50, 75.50, 87.50, 98.50, 111.50, 126.50, 148.50, 330.50}, // cent 38 to 39
406-
{0.50, 34.50, 49.50, 62.50, 73.50, 85.50, 96.50, 109.50, 124.50, 145.50, 322.50}, // cent 39 to 40
407-
{0.50, 33.50, 48.50, 60.50, 71.50, 82.50, 94.50, 106.50, 121.50, 142.50, 319.50}, // cent 40 to 41
408-
{0.50, 32.50, 47.50, 59.50, 70.50, 80.50, 91.50, 104.50, 118.50, 138.50, 321.50}, // cent 41 to 42
409-
{0.50, 31.50, 46.50, 57.50, 68.50, 78.50, 89.50, 101.50, 115.50, 135.50, 309.50}, // cent 42 to 43
410-
{0.50, 31.50, 44.50, 56.50, 66.50, 76.50, 87.50, 99.50, 113.50, 132.50, 311.50}, // cent 43 to 44
411-
{0.50, 30.50, 43.50, 54.50, 64.50, 74.50, 85.50, 96.50, 110.50, 129.50, 293.50}, // cent 44 to 45
412-
{0.50, 29.50, 42.50, 53.50, 63.50, 72.50, 82.50, 94.50, 107.50, 126.50, 307.50}, // cent 45 to 46
413-
{0.50, 28.50, 41.50, 51.50, 61.50, 70.50, 80.50, 91.50, 104.50, 123.50, 290.50}, // cent 46 to 47
414-
{0.50, 27.50, 39.50, 50.50, 59.50, 68.50, 78.50, 89.50, 102.50, 120.50, 277.50}, // cent 47 to 48
415-
{0.50, 26.50, 38.50, 48.50, 57.50, 67.50, 76.50, 87.50, 99.50, 117.50, 285.50}, // cent 48 to 49
416-
{0.50, 25.50, 37.50, 47.50, 56.50, 65.50, 74.50, 84.50, 97.50, 114.50, 264.50}, // cent 49 to 50
417-
{0.50, 25.50, 36.50, 45.50, 54.50, 63.50, 72.50, 82.50, 94.50, 111.50, 265.50}, // cent 50 to 51
418-
{0.50, 24.50, 35.50, 44.50, 53.50, 61.50, 70.50, 80.50, 91.50, 108.50, 254.50}, // cent 51 to 52
419-
{0.50, 23.50, 34.50, 43.50, 51.50, 59.50, 68.50, 77.50, 89.50, 105.50, 256.50}, // cent 52 to 53
420-
{0.50, 22.50, 33.50, 41.50, 50.50, 58.50, 66.50, 75.50, 86.50, 103.50, 235.50}, // cent 53 to 54
421-
{0.50, 22.50, 32.50, 40.50, 48.50, 56.50, 64.50, 73.50, 84.50, 100.50, 245.50}, // cent 54 to 55
422-
{0.50, 21.50, 31.50, 39.50, 47.50, 54.50, 62.50, 71.50, 82.50, 97.50, 239.50}, // cent 55 to 56
423-
{0.50, 20.50, 30.50, 38.50, 45.50, 52.50, 60.50, 69.50, 79.50, 94.50, 227.50}, // cent 56 to 57
424-
{0.50, 20.50, 29.50, 36.50, 44.50, 51.50, 58.50, 67.50, 77.50, 91.50, 229.50}, // cent 57 to 58
425-
{0.50, 19.50, 28.50, 35.50, 42.50, 49.50, 56.50, 65.50, 74.50, 89.50, 227.50}, // cent 58 to 59
426-
{0.50, 18.50, 27.50, 34.50, 41.50, 48.50, 55.50, 62.50, 72.50, 86.50, 216.50}, // cent 59 to 60
427-
{0.50, 18.50, 26.50, 33.50, 39.50, 46.50, 53.50, 60.50, 70.50, 83.50, 231.50}, // cent 60 to 61
428-
{0.50, 17.50, 25.50, 32.50, 38.50, 44.50, 51.50, 58.50, 67.50, 80.50, 194.50}, // cent 61 to 62
429-
{0.50, 17.50, 24.50, 31.50, 37.50, 43.50, 49.50, 57.50, 65.50, 78.50, 190.50}, // cent 62 to 63
430-
{0.50, 16.50, 23.50, 30.50, 36.50, 41.50, 48.50, 55.50, 63.50, 75.50, 200.50}, // cent 63 to 64
431-
{0.50, 15.50, 23.50, 29.50, 34.50, 40.50, 46.50, 53.50, 61.50, 73.50, 183.50}, // cent 64 to 65
432-
{0.50, 15.50, 22.50, 28.50, 33.50, 39.50, 44.50, 51.50, 59.50, 70.50, 187.50}, // cent 65 to 66
433-
{0.50, 14.50, 21.50, 27.50, 32.50, 37.50, 43.50, 49.50, 57.50, 68.50, 199.50}, // cent 66 to 67
434-
{0.50, 14.50, 20.50, 26.50, 31.50, 36.50, 41.50, 47.50, 55.50, 65.50, 171.50}, // cent 67 to 68
435-
{0.50, 13.50, 19.50, 25.50, 30.50, 34.50, 40.50, 45.50, 53.50, 63.50, 157.50}, // cent 68 to 69
436-
{0.50, 13.50, 19.50, 24.50, 28.50, 33.50, 38.50, 44.50, 51.50, 60.50, 156.50}, // cent 69 to 70
437-
{0.50, 12.50, 18.50, 23.50, 27.50, 32.50, 37.50, 42.50, 49.50, 58.50, 157.50}, // cent 70 to 71
438-
{0.50, 12.50, 17.50, 22.50, 26.50, 31.50, 35.50, 40.50, 47.50, 56.50, 148.50}, // cent 71 to 72
439-
{0.50, 11.50, 16.50, 21.50, 25.50, 29.50, 34.50, 39.50, 45.50, 54.50, 218.50}, // cent 72 to 73
440-
{0.50, 11.50, 16.50, 20.50, 24.50, 28.50, 32.50, 37.50, 43.50, 52.50, 201.50}, // cent 73 to 74
441-
{0.50, 10.50, 15.50, 19.50, 23.50, 27.50, 31.50, 36.50, 41.50, 49.50, 185.50}, // cent 74 to 75
442-
{0.50, 10.50, 14.50, 18.50, 22.50, 26.50, 30.50, 34.50, 40.50, 47.50, 169.50}, // cent 75 to 76
443-
{0.50, 9.50, 14.50, 18.50, 21.50, 25.50, 29.50, 33.50, 38.50, 45.50, 156.50}, // cent 76 to 77
444-
{0.50, 9.50, 13.50, 17.50, 20.50, 24.50, 27.50, 31.50, 36.50, 43.50, 150.50}, // cent 77 to 78
445-
{0.50, 9.50, 13.50, 16.50, 19.50, 23.50, 26.50, 30.50, 35.50, 42.50, 138.50}, // cent 78 to 79
446-
{0.50, 8.50, 12.50, 15.50, 19.50, 22.50, 25.50, 29.50, 33.50, 40.50, 127.50}, // cent 79 to 80
447-
{0.50, 8.50, 12.50, 15.50, 18.50, 21.50, 24.50, 27.50, 32.50, 38.50, 119.50}, // cent 80 to 81
448-
{0.50, 7.50, 11.50, 14.50, 17.50, 20.50, 23.50, 26.50, 30.50, 36.50, 105.50}, // cent 81 to 82
449-
{0.50, 7.50, 10.50, 13.50, 16.50, 19.50, 22.50, 25.50, 29.50, 35.50, 107.50}, // cent 82 to 83
450-
{0.50, 7.50, 10.50, 13.50, 15.50, 18.50, 21.50, 24.50, 28.50, 33.50, 95.50}, // cent 83 to 84
451-
{0.50, 6.50, 10.50, 12.50, 15.50, 17.50, 20.50, 23.50, 26.50, 31.50, 94.50}, // cent 84 to 85
452-
{0.50, 6.50, 9.50, 12.50, 14.50, 16.50, 19.50, 22.50, 25.50, 30.50, 89.50}, // cent 85 to 86
453-
{0.50, 6.50, 9.50, 11.50, 13.50, 15.50, 18.50, 20.50, 24.50, 28.50, 79.50}, // cent 86 to 87
454-
{0.50, 5.50, 8.50, 10.50, 13.50, 15.50, 17.50, 19.50, 22.50, 27.50, 82.50}, // cent 87 to 88
455-
{0.50, 5.50, 8.50, 10.50, 12.50, 14.50, 16.50, 18.50, 21.50, 25.50, 91.50}, // cent 88 to 89
456-
{0.50, 5.50, 7.50, 9.50, 11.50, 13.50, 15.50, 17.50, 20.50, 24.50, 74.50}, // cent 89 to 90
457-
{0.50, 5.50, 7.50, 9.50, 11.50, 12.50, 14.50, 16.50, 19.50, 23.50, 72.50}, // cent 90 to 91
458-
{0.50, 4.50, 6.50, 8.50, 10.50, 12.50, 14.50, 16.50, 18.50, 21.50, 63.50}, // cent 91 to 92
459-
{0.50, 4.50, 6.50, 8.50, 9.50, 11.50, 13.50, 15.50, 17.50, 20.50, 70.50}, // cent 92 to 93
460-
{0.50, 4.50, 6.50, 7.50, 9.50, 10.50, 12.50, 14.50, 16.50, 19.50, 56.50}, // cent 93 to 94
461-
{0.50, 4.50, 5.50, 7.50, 8.50, 10.50, 11.50, 13.50, 15.50, 18.50, 62.50}, // cent 94 to 95
462-
{0.50, 3.50, 5.50, 6.50, 8.50, 9.50, 10.50, 12.50, 14.50, 16.50, 55.50}, // cent 95 to 96
463-
{0.50, 3.50, 5.50, 6.50, 7.50, 8.50, 10.50, 11.50, 13.50, 15.50, 54.50}, // cent 96 to 97
464-
{0.50, 3.50, 4.50, 5.50, 6.50, 7.50, 9.50, 10.50, 11.50, 13.50, 44.50} // cent 97 to 98
465-
}; ///< qn bin edge from qn vector distributions, for per 10% centrality, 0-60%
466-
>>>>>>> 9ecece7a6 (femtoflow checked via o2 linter and megalinter)
364+
}; ///< qn bin edge from qn vector distributions, for per 1% centrality, 0-98%
467365
};
468366
} // namespace o2::analysis::femto_flow
469367

‎PWGCF/Femto/Core/FemtoFlowEventHisto.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
/// \brief FemtoFlowEventHisto - Histogram class for tracks, V0s and cascades
1414
/// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
1515
/// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
16-
17-
#ifndef PWGCF_FEMTO_CORE_FEMTOUFLOWEVENTHISTO_H_
18-
#define PWGCF_FEMTO_CORE_FEMTOUFLOWEVENTHISTO_H_
16+
17+
#ifndef PWGCF_FEMTO_CORE_FEMTOFLOWEVENTHISTO_H_
18+
#define PWGCF_FEMTO_CORE_FEMTOFLOWEVENTHISTO_H_
1919

2020
#include "PWGCF/Femto/DataModel/FemtoDerived.h"
2121

@@ -67,4 +67,4 @@ class FemtoFlowEventHisto
6767
};
6868
} // namespace o2::analysis::femto_flow
6969

70-
#endif // PWGCF_FEMTO_CORE_FEMTOUFLOWEVENTHISTO_H_
70+
#endif // PWGCF_FEMTO_CORE_FEMTOFLOWEVENTHISTO_H_

‎PWGCF/Femto/Core/FemtoFlowObjectSelection.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,14 @@ class FemtoFlowObjectSelection
188188
std::vector<selVariable> selVarVec;
189189
for (auto& it : mSelections) {
190190
auto selVar = it.getSelectionVariable();
191-
if (std::none_of(selVarVec.begin(), selVarVec.end(), [selVar](selVariable a) { return a == selVar; })) {
192-
selVarVec.push_back(selVar);
191+
if (std::none_of(
192+
selVarVec.begin(),
193+
selVarVec.end(),
194+
[selVar](selVariable a) {
195+
return a == selVar;
196+
}))
197+
{
198+
selVarVec.push_back(selVar);
193199
}
194200
}
195201
return selVarVec;

0 commit comments

Comments
 (0)