Skip to content

Commit cbd2a30

Browse files
author
Ionut Cristian Arsene
committed
clang fixes
1 parent 3fda81f commit cbd2a30

15 files changed

+136
-121
lines changed

‎PWGDQ/Core/AnalysisCompositeCut.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
ClassImp(AnalysisCompositeCut)
1515

16-
//____________________________________________________________________________
17-
AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
16+
//____________________________________________________________________________
17+
AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
1818
fOptionUseAND(useAND),
1919
fCutList(),
2020
fCompositeCutList()

‎PWGDQ/Core/AnalysisCut.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ AnalysisCut::AnalysisCut(const AnalysisCut& c) : TNamed(c)
5656
AnalysisCut::~AnalysisCut() = default;
5757

5858
//____________________________________________________________________________
59-
void AnalysisCut::PrintCuts() {
59+
void AnalysisCut::PrintCuts()
60+
{
6061
cout << "**************** AnalysisCut::PrintCuts" << endl;
61-
}
62+
}
63+

‎PWGDQ/Core/CutsLibrary.cxx‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3583,7 +3583,8 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
35833583
return nullptr;
35843584
}
35853585

3586-
AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) {
3586+
AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
3587+
{
35873588
//
35883589
// define here cuts which are likely to be used often
35893590
//
@@ -6422,15 +6423,15 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) {
64226423
return nullptr;
64236424
}
64246425

6425-
64266426
//________________________________________________________________________________________________
6427-
std::vector<AnalysisCut*> o2::aod::dqcuts::GetCutsFromJSON(const char* json) {
6427+
std::vector<AnalysisCut*> o2::aod::dqcuts::GetCutsFromJSON(const char* json)
6428+
{
64286429
//
64296430
// configure cuts using a json file
64306431
//
64316432

64326433
std::vector<AnalysisCut*> cuts;
6433-
//AnalysisCut* cuts[100];
6434+
// AnalysisCut* cuts[100];
64346435
LOG(info) << "========================================== interpreting JSON for analysis cuts";
64356436
LOG(info) << "JSON string: " << json;
64366437

@@ -6449,11 +6450,11 @@ std::vector<AnalysisCut*> o2::aod::dqcuts::GetCutsFromJSON(const char* json) {
64496450

64506451
// The json is expected to contain a list of objects, each of which should provide the configuration of a cut
64516452
for (rapidjson::Value::ConstMemberIterator it = document.MemberBegin(); it != document.MemberEnd(); it++) {
6452-
6453+
64536454
const char* cutName = it->name.GetString();
64546455
LOG(info) << "=================================================== Configuring cut " << cutName;
64556456
const auto& cut = it->value;
6456-
6457+
64576458
// Detect if this is an AnalysisCut or a composite cut
64586459
bool isAnalysisCut = false;
64596460
bool isAnalysisCompositeCut = false;
@@ -6468,7 +6469,7 @@ std::vector<AnalysisCut*> o2::aod::dqcuts::GetCutsFromJSON(const char* json) {
64686469
isAnalysisCompositeCut = true;
64696470
}
64706471
}
6471-
if (! (isAnalysisCut || isAnalysisCompositeCut)) {
6472+
if (!(isAnalysisCut || isAnalysisCompositeCut)) {
64726473
LOG(fatal) << "Member is neither an AnalysisCut or AnalysisCompositeCut";
64736474
return cuts;
64746475
}
@@ -6499,7 +6500,8 @@ std::vector<AnalysisCut*> o2::aod::dqcuts::GetCutsFromJSON(const char* json) {
64996500

65006501
//________________________________________________________________________________________________
65016502
template <typename T>
6502-
bool o2::aod::dqcuts::ValidateJSONAnalysisCut(T cut) {
6503+
bool o2::aod::dqcuts::ValidateJSONAnalysisCut(T cut)
6504+
{
65036505
//
65046506
// Validate cut definition in JSON file
65056507
//
@@ -6519,7 +6521,8 @@ bool o2::aod::dqcuts::ValidateJSONAnalysisCut(T cut) {
65196521

65206522
//________________________________________________________________________________________________
65216523
template <typename T>
6522-
bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
6524+
bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple)
6525+
{
65236526
//
65246527
// Validate AddCut definition in JSON file
65256528
//
@@ -6551,7 +6554,7 @@ bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
65516554
// check that the variable to cut on is a valid one (implemented in the VarManager)
65526555
const char* var = addcut->FindMember("var")->value.GetString();
65536556
if (VarManager::fgVarNamesMap.find(var) == VarManager::fgVarNamesMap.end()) {
6554-
LOG(fatal) << "Bad cut variable ("<< var << ") specified for this AddCut";
6557+
LOG(fatal) << "Bad cut variable (" << var << ") specified for this AddCut";
65556558
return false;
65566559
}
65576560

@@ -6560,15 +6563,15 @@ bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
65606563
bool cutHigh_isNumber = addcut->FindMember("cutHigh")->value.IsNumber();
65616564
if (!cutLow_isNumber) {
65626565
auto& cutLow = addcut->FindMember("cutLow")->value;
6563-
if (!cutLow.HasMember("funcName") || !cutLow.HasMember("funcBody") ||
6566+
if (!cutLow.HasMember("funcName") || !cutLow.HasMember("funcBody") ||
65646567
!cutLow.HasMember("xLow") || !cutLow.HasMember("xHigh")) {
65656568
LOG(fatal) << "Missing fields for the cutLow TF1 definition";
65666569
return false;
65676570
}
65686571
}
65696572
if (!cutHigh_isNumber) {
65706573
auto& cutHigh = addcut->FindMember("cutHigh")->value;
6571-
if (!cutHigh.HasMember("funcName") || !cutHigh.HasMember("funcBody") ||
6574+
if (!cutHigh.HasMember("funcName") || !cutHigh.HasMember("funcBody") ||
65726575
!cutHigh.HasMember("xLow") || !cutHigh.HasMember("xHigh")) {
65736576
LOG(fatal) << "Missing fields for the cutLow TF1 definition";
65746577
return false;
@@ -6581,14 +6584,14 @@ bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
65816584
}
65826585
const char* depVar = addcut->FindMember("dependentVar")->value.GetString();
65836586
if (VarManager::fgVarNamesMap.find(depVar) == VarManager::fgVarNamesMap.end()) {
6584-
LOG(fatal) << "Bad cut variable ("<< depVar << ") specified for the dependentVar";
6587+
LOG(fatal) << "Bad cut variable (" << depVar << ") specified for the dependentVar";
65856588
return false;
65866589
}
65876590
}
65886591
if (addcut->HasMember("dependentVar1") && cutLow_isNumber && cutHigh_isNumber) {
65896592
const char* depVar1 = addcut->FindMember("dependentVar1")->value.GetString();
65906593
if (VarManager::fgVarNamesMap.find(depVar1) == VarManager::fgVarNamesMap.end()) {
6591-
LOG(fatal) << "Bad cut variable ("<< depVar1 << ") specified for the dependentVar";
6594+
LOG(fatal) << "Bad cut variable (" << depVar1 << ") specified for the dependentVar";
65926595
return false;
65936596
}
65946597
if (!addcut->HasMember("depCut2Low") || !addcut->HasMember("depCut2High")) {
@@ -6599,7 +6602,7 @@ bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
65996602
if (addcut->HasMember("dependentVar2")) {
66006603
const char* depVar2 = addcut->FindMember("dependentVar2")->value.GetString();
66016604
if (VarManager::fgVarNamesMap.find(depVar2) == VarManager::fgVarNamesMap.end()) {
6602-
LOG(fatal) << "Bad cut variable ("<< depVar2 << ") specified for the dependentVar2";
6605+
LOG(fatal) << "Bad cut variable (" << depVar2 << ") specified for the dependentVar2";
66036606
return false;
66046607
}
66056608
if (!addcut->HasMember("depCut2Low") || !addcut->HasMember("depCut2High")) {
@@ -6613,8 +6616,9 @@ bool o2::aod::dqcuts::ValidateJSONAddCut(T addcut, bool isSimple) {
66136616

66146617
//_______________________________________________________________________________________________
66156618
template <typename T>
6616-
AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
6617-
6619+
AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName)
6620+
{
6621+
66186622
// Parse the json object and build an AnalysisCut
66196623
if (!ValidateJSONAnalysisCut(cut)) {
66206624
LOG(fatal) << "AnalysisCut not properly defined in the JSON file. Skipping it";
@@ -6631,7 +6635,7 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
66316635

66326636
// loop over all the members for this cut and configure the AddCut objects
66336637
for (rapidjson::Value::ConstMemberIterator it = cut->MemberBegin(); it != cut->MemberEnd(); it++) {
6634-
6638+
66356639
TString itName = it->name.GetString();
66366640

66376641
if (itName.Contains("AddCut")) {
@@ -6668,7 +6672,7 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
66686672
LOG(info) << "depCut2High " << depCut2High;
66696673
bool depCut2Exclude = (addcut.HasMember("depCut2Exclude") ? addcut.FindMember("depCut2Exclude")->value.GetBool() : false);
66706674
LOG(info) << "depCut2Exclude " << depCut2Exclude;
6671-
6675+
66726676
TF1* cutLowFunc = nullptr;
66736677
TF1* cutHighFunc = nullptr;
66746678
double cutLowNumber = 0.0;
@@ -6678,7 +6682,7 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
66786682
LOG(info) << "cutLowNumber " << cutLowNumber;
66796683
} else {
66806684
auto& cutLow = addcut.FindMember("cutLow")->value;
6681-
cutLowFunc = new TF1(cutLow.FindMember("funcName")->value.GetString(), cutLow.FindMember("funcBody")->value.GetString(),
6685+
cutLowFunc = new TF1(cutLow.FindMember("funcName")->value.GetString(), cutLow.FindMember("funcBody")->value.GetString(),
66826686
cutLow.FindMember("xLow")->value.GetDouble(), cutLow.FindMember("xHigh")->value.GetDouble());
66836687
LOG(info) << "cutLowFunc " << cutLow.FindMember("funcName")->value.GetString() << ", " << cutLow.FindMember("funcBody")->value.GetString()
66846688
<< ", " << cutLow.FindMember("xLow")->value.GetDouble() << ", " << cutLow.FindMember("xHigh")->value.GetDouble();
@@ -6688,14 +6692,14 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
66886692
LOG(info) << "cutHighNumber " << cutHighNumber;
66896693
} else {
66906694
auto& cutHigh = addcut.FindMember("cutHigh")->value;
6691-
cutHighFunc = new TF1(cutHigh.FindMember("funcName")->value.GetString(), cutHigh.FindMember("funcBody")->value.GetString(),
6695+
cutHighFunc = new TF1(cutHigh.FindMember("funcName")->value.GetString(), cutHigh.FindMember("funcBody")->value.GetString(),
66926696
cutHigh.FindMember("xLow")->value.GetDouble(), cutHigh.FindMember("xHigh")->value.GetDouble());
66936697
LOG(info) << "cutHighFunc " << cutHigh.FindMember("funcName")->value.GetString() << ", " << cutHigh.FindMember("funcBody")->value.GetString()
6694-
<< ", " << cutHigh.FindMember("xLow")->value.GetDouble() << ", " << cutHigh.FindMember("xHigh")->value.GetDouble();
6698+
<< ", " << cutHigh.FindMember("xLow")->value.GetDouble() << ", " << cutHigh.FindMember("xHigh")->value.GetDouble();
66956699
}
66966700
if (cutLow_isNumber) {
66976701
if (cutHigh_isNumber) {
6698-
retCut->AddCut(VarManager::fgVarNamesMap[var], cutLowNumber, cutHighNumber, exclude,
6702+
retCut->AddCut(VarManager::fgVarNamesMap[var], cutLowNumber, cutHighNumber, exclude,
66996703
VarManager::fgVarNamesMap[dependentVar], depCutLow, depCutHigh, depCutExclude,
67006704
VarManager::fgVarNamesMap[dependentVar2], depCut2Low, depCut2High, depCut2Exclude);
67016705
} else {
@@ -6705,7 +6709,7 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
67056709
}
67066710
} else {
67076711
if (cutHigh_isNumber) {
6708-
retCut->AddCut(VarManager::fgVarNamesMap[var], cutLowFunc, cutHighNumber, exclude,
6712+
retCut->AddCut(VarManager::fgVarNamesMap[var], cutLowFunc, cutHighNumber, exclude,
67096713
VarManager::fgVarNamesMap[dependentVar], depCutLow, depCutHigh, depCutExclude,
67106714
VarManager::fgVarNamesMap[dependentVar2], depCut2Low, depCut2High, depCut2Exclude);
67116715
} else {
@@ -6722,7 +6726,8 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) {
67226726

67236727
//_______________________________________________________________________________________________
67246728
template <typename T>
6725-
bool o2::aod::dqcuts::ValidateJSONAnalysisCompositeCut(T cut) {
6729+
bool o2::aod::dqcuts::ValidateJSONAnalysisCompositeCut(T cut)
6730+
{
67266731
//
67276732
// Validate composite cut definition in JSON file
67286733
//
@@ -6744,8 +6749,9 @@ bool o2::aod::dqcuts::ValidateJSONAnalysisCompositeCut(T cut) {
67446749

67456750
//_______________________________________________________________________________________________
67466751
template <typename T>
6747-
AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, const char* cutName) {
6748-
6752+
AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, const char* cutName)
6753+
{
6754+
67496755
// Configure an AnalysisCompositeCut
67506756
if (!ValidateJSONAnalysisCompositeCut(cut)) {
67516757
LOG(fatal) << "Composite Cut not properly defined in the JSON file. Skipping it";
@@ -6764,7 +6770,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, cons
67646770
TString itName = it->name.GetString();
67656771

67666772
if (itName.Contains("AddCut")) {
6767-
6773+
67686774
LOG(debug) << "Parsing " << itName.Data();
67696775
const auto& addcut = it->value;
67706776
if (!ValidateJSONAddCut(&addcut, false)) {
@@ -6782,7 +6788,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, cons
67826788
if (typeStr.CompareTo("AnalysisCompositeCut") == 0) {
67836789
isAnalysisCompositeCut = true;
67846790
}
6785-
6791+
67866792
// Add an AnalysisCut
67876793
if (isAnalysisCut) {
67886794
AnalysisCut* cutMember = ParseJSONAnalysisCut(&addcut, itName.Data());
@@ -6805,4 +6811,5 @@ AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, cons
68056811
}
68066812

68076813
return retCut;
6808-
}
6814+
}
6815+

‎PWGDQ/Core/CutsLibrary.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ AnalysisCompositeCut* GetCompositeCut(const char* cutName);
107107
AnalysisCut* GetAnalysisCut(const char* cutName);
108108

109109
std::vector<AnalysisCut*> GetCutsFromJSON(const char* json);
110-
//AnalysisCut** GetCutsFromJSON(const char* json);
110+
// AnalysisCut** GetCutsFromJSON(const char* json);
111111
template <typename T>
112112
bool ValidateJSONAnalysisCut(T cut);
113113
template <typename T>

‎PWGDQ/Core/HistogramManager.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ void HistogramManager::AddHistogram(const char* histClass, const char* hname, co
564564
fUsedVars[varW] = kTRUE;
565565
}
566566

567-
for (int i=0; i < nDimensions; i++) {
567+
for (int i = 0; i < nDimensions; i++) {
568568
if (xmax[i] <= xmin[i]) {
569569
LOG(warn) << "HistogramManager::AddHistogram(): Histogram " << hname << " has wrong axes ranges for dimension " << i
570570
<< ", (xmin/xmax): " << xmin[i] << " / " << xmax[i];

0 commit comments

Comments
 (0)