Skip to content

Commit 9e1ae25

Browse files
committed
solving issue #112 on PlanesDeltaAngle functor
1 parent 2de9760 commit 9e1ae25

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

hydra/functions/PlanesDeltaAngle.h

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ namespace hydra {
5353
* This functor calculates the delta angle between decay plane of the particle with four-vector d2 and d3 (same plane)
5454
* and h1 (other plane)
5555
*/
56-
class PlanesDeltaAngle:public BaseFunctor<PlanesDeltaAngle, double, 0>
56+
57+
class PlanesDeltaAngle:public BaseFunctor<PlanesDeltaAngle, double(Vector4R, Vector4R, Vector4R), 0>
5758
{
5859

5960
public:
@@ -63,18 +64,18 @@ class PlanesDeltaAngle:public BaseFunctor<PlanesDeltaAngle, double, 0>
6364

6465
__hydra_host__ __hydra_device__
6566
PlanesDeltaAngle( PlanesDeltaAngle const& other):
66-
BaseFunctor<PlanesDeltaAngle,double, 0>(other)
67+
BaseFunctor<PlanesDeltaAngle,double(Vector4R, Vector4R, Vector4R), 0>(other)
6768
{}
6869

6970
__hydra_host__ __hydra_device__ inline
7071
PlanesDeltaAngle& operator=( PlanesDeltaAngle const& other){
7172
if(this==&other) return *this;
72-
BaseFunctor<PlanesDeltaAngle,double, 0>::operator=(other);
73+
BaseFunctor<PlanesDeltaAngle,double(Vector4R, Vector4R, Vector4R), 0>::operator=(other);
7374
return *this;
7475
}
7576

7677
__hydra_host__ __hydra_device__ inline
77-
double Evaluate(unsigned int , hydra::Vector4R* p) const {
78+
double Evaluate( hydra::Vector4R d2, hydra::Vector4R d3, hydra::Vector4R h1) const {
7879

7980
hydra::Vector4R d2 = p[0];
8081
hydra::Vector4R d3 = p[1];
@@ -84,23 +85,6 @@ class PlanesDeltaAngle:public BaseFunctor<PlanesDeltaAngle, double, 0>
8485

8586
}
8687

87-
template<typename T>
88-
__hydra_host__ __hydra_device__ inline
89-
double Evaluate(T p) const {
90-
91-
hydra::Vector4R d2 = get<0>(p);
92-
hydra::Vector4R d3 = get<1>(p);
93-
hydra::Vector4R h1 = get<2>(p);
94-
95-
return chi_angle( d2, d3, h1);
96-
}
97-
98-
__hydra_host__ __hydra_device__ inline
99-
double operator()(Vector4R const& d2, Vector4R const& d3, Vector4R const& h1, Vector4R const& h2) const {
100-
101-
return chi_angle( d2, d3, h1);
102-
103-
}
10488

10589
private:
10690

0 commit comments

Comments
 (0)