diff --git a/Framework/Core/include/Framework/Expressions.h b/Framework/Core/include/Framework/Expressions.h index db82b64a1e416..9e3b681dab3e2 100644 --- a/Framework/Core/include/Framework/Expressions.h +++ b/Framework/Core/include/Framework/Expressions.h @@ -501,7 +501,7 @@ inline Node binned(std::vector const& binning, std::vector const& paramete const auto binned_copy = binned; const auto out_copy = out; auto root = ifnode(Node{binned_copy} < binning[0], Node{out_copy}, LiteralNode{-1}); - root.right = std::make_unique(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning [1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1})); + root.right = std::make_unique(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning[1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1})); auto* current = root.right.get(); for (auto i = 1; i < bins; ++i) { current->right = std::make_unique(ifnode(Node{binned_copy} <= binning[i + 1], updateParameters(pexp, bins, parameters, i), LiteralNode{-1})); @@ -516,8 +516,7 @@ template Node updateParameters(Node const& pexp, int bins, std::vector const& parameters, int bin) { Node result{pexp}; - auto updateParameter = [&bins, ¶meters, &bin](Node* node) - { + auto updateParameter = [&bins, ¶meters, &bin](Node* node) { if (node->self.index() == 5) { auto* n = std::get_if<5>(&node->self); n->reset(parameters[bin * bins + n->index]); @@ -527,7 +526,6 @@ Node updateParameters(Node const& pexp, int bins, std::vector const& paramete return result; } - /// A struct, containing the root of the expression tree struct Filter { Filter() = default; diff --git a/Framework/Core/src/Expressions.cxx b/Framework/Core/src/Expressions.cxx index ade9af1e6f6f3..6f646515b7837 100644 --- a/Framework/Core/src/Expressions.cxx +++ b/Framework/Core/src/Expressions.cxx @@ -250,7 +250,7 @@ Operations createOperations(Filter const& expression) [lh = LiteralNodeHelper{}](LiteralNode const& node) { return lh(node); }, [bh = BindingNodeHelper{}](BindingNode const& node) { return bh(node); }, [ph = PlaceholderNodeHelper{}](PlaceholderNode const& node) { return ph(node); }, - [pr = ParameterNodeHelper{}](ParameterNode const& node){ return pr(node); }, + [pr = ParameterNodeHelper{}](ParameterNode const& node) { return pr(node); }, [](auto&&) { return DatumSpec{}; }}, node->self); };