Skip to content

Commit 694ea3f

Browse files
mcoquet642mcoquet642
committed
fixing bugs introduced in HistogramsLibrary
1 parent 85cc012 commit 694ea3f

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,7 +2545,7 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist)
25452545
}
25462546
// Check if the histogram uses constant binning
25472547
bool isConstantBinning = true;
2548-
if (!(hist->HasMember("xmin.data()") && hist->HasMember("xmax.data()"))) {
2548+
if (!(hist->HasMember("xmin") && hist->HasMember("xmax"))) {
25492549
isConstantBinning = false;
25502550
}
25512551

@@ -2556,17 +2556,17 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist)
25562556
bool isProfile = (hist->HasMember("isProfile") ? hist->FindMember("isProfile")->value.GetBool() : false);
25572557

25582558
if (isConstantBinning) {
2559-
if (!hist->HasMember("xmin.data()") || !hist->HasMember("xmax.data()")) {
2560-
LOG(fatal) << "Missing xmin.data() or xmax.data() information for histogram";
2559+
if (!hist->HasMember("xmin") || !hist->HasMember("xmax")) {
2560+
LOG(fatal) << "Missing xmin or xmax information for histogram";
25612561
return false;
25622562
}
25632563
if (isTHn) {
2564-
if (!hist->FindMember("xmin.data()")->value.IsArray()) {
2565-
LOG(fatal) << "xmin.data() field should be an array of arrays";
2564+
if (!hist->FindMember("xmin")->value.IsArray()) {
2565+
LOG(fatal) << "xmin field should be an array of arrays";
25662566
return false;
25672567
}
2568-
if (!hist->FindMember("xmax.data()")->value.IsArray()) {
2569-
LOG(fatal) << "xmax.data() field should be an array of arrays";
2568+
if (!hist->FindMember("xmax")->value.IsArray()) {
2569+
LOG(fatal) << "xmax field should be an array of arrays";
25702570
return false;
25712571
}
25722572
}
@@ -2594,8 +2594,8 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist)
25942594
}
25952595

25962596
if (isTHn) {
2597-
if (!hist->HasMember("nDimensions") || !hist->HasMember("vars.data()")) {
2598-
LOG(fatal) << "Missing nDimensions or vars.data() fields for histogram";
2597+
if (!hist->HasMember("nDimensions") || !hist->HasMember("vars")) {
2598+
LOG(fatal) << "Missing nDimensions or vars fields for histogram";
25992599
return false;
26002600
}
26012601
if (isConstantBinning) {
@@ -2683,9 +2683,9 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist)
26832683
}
26842684
}
26852685
if (isTHn) {
2686-
for (auto& v : hist->FindMember("vars.data()")->value.GetArray()) {
2686+
for (auto& v : hist->FindMember("vars")->value.GetArray()) {
26872687
if (VarManager::fgVarNamesMap.find(v.GetString()) == VarManager::fgVarNamesMap.end()) {
2688-
LOG(fatal) << "Bad variable in vars.data() (" << v.GetString() << ") specified for histogram";
2688+
LOG(fatal) << "Bad variable in vars (" << v.GetString() << ") specified for histogram";
26892689
return false;
26902690
}
26912691
}
@@ -2740,7 +2740,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
27402740
bool isTH3 = (histTypeStr.CompareTo("TH3") == 0);
27412741
bool isTHn = (histTypeStr.CompareTo("THn") == 0);
27422742
bool isConstantBinning = true;
2743-
if (!(hist.HasMember("xmin.data()") && hist.HasMember("xmax.data()"))) {
2743+
if (!(hist.HasMember("xmin") && hist.HasMember("xmax"))) {
27442744
isConstantBinning = false;
27452745
}
27462746

@@ -2757,7 +2757,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
27572757

27582758
int* vars = new int[nDimensions];
27592759
int iDim = 0;
2760-
for (auto& v : hist.FindMember("vars.data()")->value.GetArray()) {
2760+
for (auto& v : hist.FindMember("vars")->value.GetArray()) {
27612761
LOG(debug) << "iDim " << iDim << ": " << v.GetString();
27622762
vars[iDim++] = VarManager::fgVarNamesMap[v.GetString()];
27632763
}
@@ -2776,14 +2776,14 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
27762776
LOG(debug) << "nBins " << iDim << ": " << nBins[iDim - 1];
27772777
}
27782778
iDim = 0;
2779-
for (auto& v : hist.FindMember("xmin.data()")->value.GetArray()) {
2779+
for (auto& v : hist.FindMember("xmin")->value.GetArray()) {
27802780
xmin[iDim++] = v.GetDouble();
2781-
LOG(debug) << "xmin.data() " << iDim << ": " << xmin[iDim - 1];
2781+
LOG(debug) << "xmin " << iDim << ": " << xmin[iDim - 1];
27822782
}
27832783
iDim = 0;
2784-
for (auto& v : hist.FindMember("xmax.data()")->value.GetArray()) {
2784+
for (auto& v : hist.FindMember("xmax")->value.GetArray()) {
27852785
xmax[iDim++] = v.GetDouble();
2786-
LOG(debug) << "xmax.data() " << iDim << ": " << xmax[iDim - 1];
2786+
LOG(debug) << "xmax " << iDim << ": " << xmax[iDim - 1];
27872787
}
27882788
} else {
27892789
int iDim = 0;
@@ -2813,11 +2813,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
28132813

28142814
if (isConstantBinning) {
28152815
for (auto histClass : histClasses) {
2816-
hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), nBins, xmin.data(), xmax.data(), axLabels, varW, useSparse, isDouble);
2816+
hm->AddHistogram(histClass, histName, title, nDimensions, vars, nBins, xmin, xmax, axLabels, varW, useSparse, isDouble);
28172817
}
28182818
} else {
28192819
for (auto histClass : histClasses) {
2820-
hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), binLimits, axLabels, varW, useSparse, isDouble);
2820+
hm->AddHistogram(histClass, histName, title, nDimensions, vars, binLimits, axLabels, varW, useSparse, isDouble);
28212821
}
28222822
}
28232823

@@ -2834,11 +2834,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
28342834
const char* varX = hist.FindMember("varX")->value.GetString();
28352835
LOG(debug) << "varX: " << varX;
28362836

2837-
double xmin = (hist.HasMember("xmin.data()") ? hist.FindMember("xmin.data()")->value.GetDouble() : 0.0);
2838-
LOG(debug) << "xmin.data(): " << xmin.data();
2837+
double xmin = (hist.HasMember("xmin") ? hist.FindMember("xmin")->value.GetDouble() : 0.0);
2838+
LOG(debug) << "xmin: " << xmin;
28392839

2840-
double xmax = (hist.HasMember("xmax.data()") ? hist.FindMember("xmax.data()")->value.GetDouble() : 0.0);
2841-
LOG(debug) << "xmax.data(): " << xmax.data();
2840+
double xmax = (hist.HasMember("xmax") ? hist.FindMember("xmax")->value.GetDouble() : 0.0);
2841+
LOG(debug) << "xmax: " << xmax;
28422842

28432843
std::vector<double> xbinsVec;
28442844
if (hist.HasMember("xbins")) {
@@ -2915,7 +2915,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
29152915
if (isConstantBinning) {
29162916
for (auto histClass : histClasses) {
29172917
hm->AddHistogram(histClass, histName, title, isProfile,
2918-
nXbins, xmin.data(), xmax.data(), VarManager::fgVarNamesMap[varX],
2918+
nXbins, xmin, xmax, VarManager::fgVarNamesMap[varX],
29192919
nYbins, ymin, ymax, VarManager::fgVarNamesMap[varY],
29202920
nZbins, zmin, zmax, VarManager::fgVarNamesMap[varZ],
29212921
xLabels, yLabels, zLabels,

0 commit comments

Comments
 (0)