Skip to content

Please consider the following formatting changes to #14454 #103

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

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #14454 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b532491
move unnecessary statics to .cxx
aalkin Jun 30, 2025
7362463
Please consider the following formatting changes
alibuild Jun 30, 2025
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
58 changes: 0 additions & 58 deletions Framework/Core/include/Framework/BasicOps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
// or submit itself to any jurisdiction.
#ifndef O2_FRAMEWORK_BASICOPS_H_
#define O2_FRAMEWORK_BASICOPS_H_
#include <array>
#include <string_view>
#include "CommonConstants/MathConstants.h"

namespace o2::framework
{
Expand Down Expand Up @@ -49,61 +46,6 @@ enum BasicOp : unsigned int {
BitwiseNot,
Conditional // 3-ar functions
};

static constexpr std::array<std::string_view, BasicOp::Conditional + 1> mapping{
"&&",
"||",
"+",
"-",
"/",
"*",
"&",
"|",
"^",
"<",
"<=",
">",
">=",
"==",
"!=",
"natan2",
"npow",
"nsqrt",
"nexp",
"nlog",
"nlog10",
"nsin",
"ncos",
"ntan",
"nasin",
"nacos",
"natan",
"nabs",
"nround",
"nbitwise_not",
"ifnode"};

static constexpr std::array<std::string_view, 9> mathConstants{
"Almost0",
"Epsilon",
"Almost1",
"VeryBig",
"PI",
"TwoPI",
"PIHalf",
"PIThird",
"PIQuarter"};

static constexpr std::array<float, 9> mathConstantsValues{
o2::constants::math::Almost0,
o2::constants::math::Epsilon,
o2::constants::math::Almost1,
o2::constants::math::VeryBig,
o2::constants::math::PI,
o2::constants::math::TwoPI,
o2::constants::math::PIHalf,
o2::constants::math::PIThird,
o2::constants::math::PIQuarter};
} // namespace o2::framework

#endif // O2_FRAMEWORK_BASICOPS_H_
61 changes: 60 additions & 1 deletion Framework/Core/src/Expressions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <set>
#include <stack>
#include <unordered_map>
#include "CommonConstants/MathConstants.h"

using namespace o2::framework;

Expand All @@ -29,9 +30,67 @@ void unknownParameterUsed(const char* name)
runtime_error_f("Unknown parameter used in expression: %s", name);
}

/// a map between BasicOp and tokens in string expressions
constexpr std::array<std::string_view, BasicOp::Conditional + 1> mapping{
"&&",
"||",
"+",
"-",
"/",
"*",
"&",
"|",
"^",
"<",
"<=",
">",
">=",
"==",
"!=",
"natan2",
"npow",
"nsqrt",
"nexp",
"nlog",
"nlog10",
"nsin",
"ncos",
"ntan",
"nasin",
"nacos",
"natan",
"nabs",
"nround",
"nbitwise_not",
"ifnode"};

/// math constants to recognize in string expressions
constexpr std::array<std::string_view, 9> mathConstants{
"Almost0",
"Epsilon",
"Almost1",
"VeryBig",
"PI",
"TwoPI",
"PIHalf",
"PIThird",
"PIQuarter"};

/// values of math constants to substiture
constexpr std::array<float, 9> mathConstantsValues{
o2::constants::math::Almost0,
o2::constants::math::Epsilon,
o2::constants::math::Almost1,
o2::constants::math::VeryBig,
o2::constants::math::PI,
o2::constants::math::TwoPI,
o2::constants::math::PIHalf,
o2::constants::math::PIThird,
o2::constants::math::PIQuarter};

/// a map between BasicOp and gandiva node definitions
/// note that logical 'and' and 'or' are created separately
static constexpr std::array<const char*, BasicOp::Conditional + 1> basicOperationsMap = {
constexpr std::array<const char*, BasicOp::Conditional + 1> basicOperationsMap = {
"and",
"or",
"add",
Expand Down