Commit 982dfb7c authored by Administrator's avatar Administrator
Browse files

Fix name clash of define statement

When reordering the include statements a name clash between a define statement
in L1 code and a function in Root's TF1.h was found which did not allow to
compile the code.
Rename the define statement such that the name clash is resolved. refs #2051
parent a4ff6ac2
......@@ -451,7 +451,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
S4 += w * sHit.S4;
}
} while (NotEmpty(Dmax > fvec(0.)));
} while (NotEmptyFvec(Dmax > fvec(0.)));
#ifdef PRINT_TIMING
......@@ -501,7 +501,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
#ifdef PRINT_TIMING
GetTimer("Ring finding: Store ring").Start(0);
#endif // PRINT_TIMING
if (ISUNLIKELY(Empty(validRing))) continue;
if (ISUNLIKELY(EmptyFvec(validRing))) continue;
///////////
#if 0 // TODO 1
......
......@@ -163,8 +163,8 @@ public:
#define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c)) // analog (a) ? b : c
#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F32vec4 bool2int(const F32vec4& a) { // mask returned
......
......@@ -152,8 +152,8 @@ public:
#define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c)) // analog (a) ? b : c
#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F64vec2 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F64vec2 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F64vec2 bool2int(const F64vec2& a) { // mask returned
......
......@@ -112,8 +112,8 @@ public:
return z;
}
#define NotEmpty(a) bool((a)[0])
#define Empty(a) !(bool((a)[0]))
#define NotEmptyFvec(a) bool((a)[0])
#define EmptyFvec(a) !(bool((a)[0]))
friend F32vec1 bool2int(const F32vec1& a) { // mask returned
return if3(a, 1, 0);
}
......
......@@ -115,8 +115,8 @@ public:
return z;
}
#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F32vec4 bool2int(const F32vec4& a) { // mask returned
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment