getVarLevelPercentiles(): cleanup.

src/percentiles_hist.cc

@@ -465,11 +465,8 @@ calcPercentile(size_t nhists, const std::vector<Histogram> &hists, const double
   return nmiss;
 }
 
-const auto _getVarLevelPercentiles = [](LambdaField_T_ field, const int varID, const int levelID, const double p, const int nlevels, int nvars,  std::vector<Histogram>& hists, const size_t nhists)
+const auto _getVarLevelPercentiles = [](LambdaField_T_ field, const double p, const size_t nhists, std::vector<Histogram>& hists)
 {
-  if (varID < 0 || varID >= nvars) cdo_abort("Illegal argument: varID %d is undefined (%s)", varID, __func__);
-
-  if (levelID < 0 || levelID >= nlevels) cdo_abort("Illegal argument: levelID %d is undefined (%s)", levelID, __func__);
 
   if (nhists != gridInqSize(field.grid)) cdo_abort("Grids are different (%s)", __func__);
 
@@ -477,6 +474,12 @@ const auto _getVarLevelPercentiles = [](LambdaField_T_ field, const int varID, c
 };
 
 void
-HistogramSet::getVarLevelPercentiles(Field_t &field, const int varID, const int levelID, const double p) {
-  field_operation(_getVarLevelPercentiles, field, varID, levelID, p, this->var_nlevels[varID], nvars, this->histograms[varID][levelID], this->var_nhists[varID]);
+HistogramSet::getVarLevelPercentiles(Field_t &field, const int varID, const int levelID, const double p)
+{
+  if (varID < 0 || varID >= nvars) cdo_abort("Illegal argument: varID %d is undefined (%s)", varID, __func__);
+
+  const auto nlevels = this->var_nlevels[varID];
+  if (levelID < 0 || levelID >= nlevels) cdo_abort("Illegal argument: levelID %d is undefined (%s)", levelID, __func__);
+
+  field_operation(_getVarLevelPercentiles, field, p, this->var_nhists[varID], this->histograms[varID][levelID]);
 }