detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-19 18:47:13 +02:00
Code Issues Actions Packages Releases Activity

enum is now enum class

Browse Source
This commit is contained in:
Mazzoleni Alice Francesca
2025-04-15 14:57:25 +02:00
parent fca9d5d2fa
commit d4050ec557
3 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/aare/CalculateEta.hpp
View File

@ -6,14 +6,14 @@
namespace aare {
typedef enum {
enum class corner : int {
cBottomLeft = 0,
cBottomRight = 1,
cTopLeft = 2,
cTopRight = 3
} corner;
};
typedef enum {
enum class pixel : int {
pBottomLeft = 0,
pBottom = 1,
pBottomRight = 2,
@ -23,7 +23,7 @@ typedef enum {
pTopLeft = 6,
pTop = 7,
pTopRight = 8
} pixel;
};
template <typename T> struct Eta2 {
double x;
@ -132,7 +132,8 @@ Eta2<T> calculate_eta2(const Cluster<T, 2, 2, int16_t> &cl) {
if ((cl.data[0] + cl.data[2]) != 0)
eta.y = static_cast<double>(cl.data[2]) / (cl.data[0] + cl.data[2]);
eta.sum = cl.sum();
eta.c = cBottomLeft; // TODO! This is not correct, but need to put something
eta.c = static_cast<int>(corner::cBottomLeft); // TODO! This is not correct,
// but need to put something
return eta;
}

10
include/aare/Interpolator.hpp
View File

@ -70,20 +70,20 @@ Interpolator::interpolate(const ClusterVector<ClusterType> &clusters) {
// cBottomRight = 1,
// cTopLeft = 2,
// cTopRight = 3
switch (eta.c) {
case cTopLeft:
switch (static_cast<corner>(eta.c)) {
case corner::cTopLeft:
dX = -1.;
dY = 0;
break;
case cTopRight:;
case corner::cTopRight:;
dX = 0;
dY = 0;
break;
case cBottomLeft:
case corner::cBottomLeft:
dX = -1.;
dY = -1.;
break;
case cBottomRight:
case corner::cBottomRight:
dX = 0.;
dY = -1.;
break;