diff --git a/Device/Detector/OffspecDetector.cpp b/Device/Detector/OffspecDetector.cpp index 6a845e2f139168086eb567c93516db7ec2f06caa..d735b1ff0099be9401af66c5e3cea21f19f9c2ab 100644 --- a/Device/Detector/OffspecDetector.cpp +++ b/Device/Detector/OffspecDetector.cpp @@ -19,8 +19,8 @@ OffspecDetector::OffspecDetector(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max) - : m_axes{std::shared_ptr<IAxis>(newFixedBinAxis("phi_f", n_phi, phi_min, phi_max)), - std::shared_ptr<IAxis>(newFixedBinAxis("alpha_f", n_alpha, alpha_min, alpha_max))} + : m_axes{sharedFixedBinAxis("phi_f", n_phi, phi_min, phi_max), + sharedFixedBinAxis("alpha_f", n_alpha, alpha_min, alpha_max)} { } diff --git a/Device/Detector/RectangularDetector.cpp b/Device/Detector/RectangularDetector.cpp index 6a08c6e3e96b00003e2636de3f52fa81ff02f27e..69b0d526e7cf346dd121066f6cc3fba6f4f7f145 100644 --- a/Device/Detector/RectangularDetector.cpp +++ b/Device/Detector/RectangularDetector.cpp @@ -37,8 +37,7 @@ RectangularDetector::RectangularDetector(std::array<std::shared_ptr<IAxis>, 2> a RectangularDetector::RectangularDetector(size_t nxbins, double width, size_t nybins, double height) : RectangularDetector(std::array<std::shared_ptr<IAxis>, 2>{ - std::shared_ptr<IAxis>(newFixedBinAxis("u", nxbins, 0.0, width)), - std::shared_ptr<IAxis>(newFixedBinAxis("v", nybins, 0.0, height))}) + sharedFixedBinAxis("u", nxbins, 0.0, width), sharedFixedBinAxis("v", nybins, 0.0, height)}) { } diff --git a/Device/Detector/SphericalDetector.cpp b/Device/Detector/SphericalDetector.cpp index 2eb035d9f2849d71d96c3185d1fbda6e42b6c08d..35ac03a9928ece8101020118aa71817479f92e11 100644 --- a/Device/Detector/SphericalDetector.cpp +++ b/Device/Detector/SphericalDetector.cpp @@ -31,8 +31,8 @@ SphericalDetector::SphericalDetector(std::array<std::shared_ptr<IAxis>, 2> axes) SphericalDetector::SphericalDetector(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max) : SphericalDetector(std::array<std::shared_ptr<IAxis>, 2>{ - std::shared_ptr<IAxis>(newFixedBinAxis("phi_f", n_phi, phi_min, phi_max)), - std::shared_ptr<IAxis>(newFixedBinAxis("alpha_f", n_alpha, alpha_min, alpha_max))}) + sharedFixedBinAxis("phi_f", n_phi, phi_min, phi_max), + sharedFixedBinAxis("alpha_f", n_alpha, alpha_min, alpha_max)}) { }