Skip to content

Commit

Permalink
indent
Browse files Browse the repository at this point in the history
  • Loading branch information
ahinzmann committed Dec 17, 2019
1 parent 08528db commit 860f3bc
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
20 changes: 10 additions & 10 deletions CondFormats/JetMETObjects/src/JetResolutionObject.cc
Original file line number Diff line number Diff line change
Expand Up @@ -170,19 +170,19 @@ namespace JME {
std::transform(formula_str_lower.begin(), formula_str_lower.end(), formula_str_lower.begin(), ::tolower);

if (formula_str_lower == "none") {
m_formula_str = "";
m_formula_str = "";

if ((tokens.size() > n_bins + n_variables + 3) && (std::atoi(tokens[n_bins + n_variables + 3].c_str()))) {
size_t n_parameters = std::stoul(tokens[n_bins + n_variables + 3]);
if ((tokens.size() > n_bins + n_variables + 3) && (std::atoi(tokens[n_bins + n_variables + 3].c_str()))) {
size_t n_parameters = std::stoul(tokens[n_bins + n_variables + 3]);

if (tokens.size() < (1 + n_bins + 1 + n_variables + 1 + 1 + n_parameters)) {
throwException(edm::errors::ConfigFileReadError, "Invalid file format. Please check.");
}
if (tokens.size() < (1 + n_bins + 1 + n_variables + 1 + 1 + n_parameters)) {
throwException(edm::errors::ConfigFileReadError, "Invalid file format. Please check.");
}

for (size_t i = 0; i < n_parameters; i++) {
m_formula_str += tokens[n_bins + n_variables + 4 + i] + " ";
}
}
for (size_t i = 0; i < n_parameters; i++) {
m_formula_str += tokens[n_bins + n_variables + 4 + i] + " ";
}
}
}

init();
Expand Down
35 changes: 17 additions & 18 deletions JetMETCorrections/Modules/src/JetResolution.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,23 @@ namespace JME {
return 1;

const std::vector<float>& parameters_values = record->getParametersValues();
const std::vector<std::string>& parameter_names = m_object->getDefinition().getParametersName();
size_t parameter = static_cast<size_t>(variation);
if (!uncertaintySource.empty()) {
if (variation == Variation::DOWN)
parameter =
std::distance(parameter_names.begin(),
std::find(parameter_names.begin(), parameter_names.end(), uncertaintySource + "Down"));
else if (variation == Variation::UP)
parameter = std::distance(parameter_names.begin(),
std::find(parameter_names.begin(), parameter_names.end(), uncertaintySource + "Up"));
if (parameter >= parameter_names.size()) {
std::string s;
for (const auto& piece : parameter_names)
s += piece + " ";
throw cms::Exception("InvalidParameter") << "Invalid value for 'uncertaintySource' parameter. Only " + s + " are supported.\n";
}
}
return parameters_values[parameter];
const std::vector<std::string>& parameter_names = m_object->getDefinition().getParametersName();
size_t parameter = static_cast<size_t>(variation);
if (!uncertaintySource.empty()) {
if (variation == Variation::DOWN)
parameter = std::distance(parameter_names.begin(),
std::find(parameter_names.begin(), parameter_names.end(), uncertaintySource + "Down"));
else if (variation == Variation::UP)
parameter = std::distance(parameter_names.begin(),
std::find(parameter_names.begin(), parameter_names.end(), uncertaintySource + "Up"));
if (parameter >= parameter_names.size()) {
std::string s;
for (const auto& piece : parameter_names)
s += piece + " ";
throw cms::Exception("InvalidParameter") << "Invalid value for 'uncertaintySource' parameter. Only " + s + " are supported.\n";
}
}
return parameters_values[parameter];
}

}
Expand Down

0 comments on commit 860f3bc

Please sign in to comment.