diff --git a/Device/Detector/Detector2D.cpp b/Device/Detector/Detector2D.cpp index 1df83444d00aa5bd884c6a2f533e807a49f5e515..71cd41c65ac97087e5889a1ef224a725f568ce7e 100644 --- a/Device/Detector/Detector2D.cpp +++ b/Device/Detector/Detector2D.cpp @@ -24,13 +24,12 @@ using std::numbers::pi; -Detector2D::Detector2D(double phi_full_width, double alpha_full_width, size_t n_phi, size_t n_alpha, +Detector2D::Detector2D(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha, double phi_center, double alpha_center) - : IDetector( - new Frame(newEquiDivision("phi_f (rad)", n_phi, phi_center - phi_full_width / 2, - phi_center + phi_full_width / 2), - newEquiDivision("alpha_f (rad)", n_alpha, alpha_center - alpha_full_width / 2, - alpha_center + alpha_full_width / 2))) + : IDetector(new Frame( + newEquiDivision("phi_f (rad)", n_phi, phi_center - phi_span / 2, phi_center + phi_span / 2), + newEquiDivision("alpha_f (rad)", n_alpha, alpha_center - alpha_span / 2, + alpha_center + alpha_span / 2))) { ASSERT(-pi / 2 < axis(0).min() && axis(0).max() < +pi / 2); ASSERT(-pi / 2 < axis(1).min() && axis(1).max() < +pi / 2); diff --git a/Device/Detector/Detector2D.h b/Device/Detector/Detector2D.h index ba03919eeb3fb094a31dbdb0a8734154121c1ecc..de7c57323c172f710c916e78e31c640c3167855e 100644 --- a/Device/Detector/Detector2D.h +++ b/Device/Detector/Detector2D.h @@ -21,8 +21,8 @@ class Pixel; class Detector2D : public IDetector { public: - Detector2D(double phi_full_width, double alpha_full_width, size_t n_phi, size_t n_alpha, - double center_phi, double center_alpha); + Detector2D(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha, double phi_center, + double alpha_center); ~Detector2D() override = default;