Skip to content

DPL Analysis: add clamp node to constrain a result of an expression between two values #14305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
May 21, 2025
Merged

DPL Analysis: add clamp node to constrain a result of an expression between two values #14305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Framework/Core/include/Framework/Expressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,14 @@ inline Node updateParameters(Node const& pexp, int bins, std::vector<T> const& p
return result;
}

/// clamping functional
template <typename T>
inline Node clamp(Node&& expr, T low, T hi)
{
auto copy = expr;
return ifnode(Node{copy} < LiteralNode{low}, LiteralNode{low}, ifnode(Node{copy} > LiteralNode{hi}, LiteralNode{hi}, Node{copy}));
}

/// A struct, containing the root of the expression tree
struct Filter {
Filter() = default;
Expand Down
7 changes: 7 additions & 0 deletions Framework/Core/test/test_Expressions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,13 @@ TEST_CASE("TestConditionalExpressions")
auto gandiva_condition2 = makeCondition(gandiva_tree2);
auto gandiva_filter2 = createFilter(schema2, gandiva_condition2);
REQUIRE(gandiva_tree2->ToString() == "bool greater_than((float) fSigned1Pt, (const float) 0 raw(0)) && if (bool less_than(float absf((float) fEta), (const float) 1 raw(3f800000)) && if (bool less_than((float) fPt, (const float) 1 raw(3f800000))) { bool greater_than((float) fPhi, (const float) 1.5708 raw(3fc90fdb)) } else { bool less_than((float) fPhi, (const float) 1.5708 raw(3fc90fdb)) }) { bool greater_than(float absf((float) fX), (const float) 1 raw(3f800000)) } else { bool greater_than(float absf((float) fY), (const float) 1 raw(3f800000)) }");

// clamp
Projector clp = clamp(o2::aod::track::pt, 1.0f, 10.f);
auto clpspecs = createOperations(clp);
auto schemaclp = std::make_shared<arrow::Schema>(std::vector{o2::aod::track::Pt::asArrowField()});
auto gandiva_tree_clp = createExpressionTree(clpspecs, schemaclp);
REQUIRE(gandiva_tree_clp->ToString() == "if (bool less_than((float) fPt, (const float) 1 raw(3f800000))) { (const float) 1 raw(3f800000) } else { if (bool greater_than((float) fPt, (const float) 10 raw(41200000))) { (const float) 10 raw(41200000) } else { (float) fPt } }");
}

TEST_CASE("TestBinnedExpressions")
Expand Down