diff --git a/Device/Detector/DetectorFunctions.cpp b/Device/Detector/DetectorFunctions.cpp index 5b0ef50383fdac98d38b135316a2333ef9827caa..3988960c1e58c1c92233416788ecca8df9a062c4 100644 --- a/Device/Detector/DetectorFunctions.cpp +++ b/Device/Detector/DetectorFunctions.cpp @@ -14,12 +14,6 @@ #include "Device/Detector/DetectorFunctions.h" #include "Device/Data/OutputData.h" -#include "Device/Detector/SimulationArea.h" -#include "Fit/Tools/StringUtils.h" -#include <algorithm> -#include <cctype> -#include <map> -#include <sstream> bool DetectorFunctions::hasSameDimensions(const IDetector& detector, const OutputData<double>& data) { @@ -32,33 +26,3 @@ bool DetectorFunctions::hasSameDimensions(const IDetector& detector, const Outpu return true; } - -std::string DetectorFunctions::axesToString(const IDetector& detector) -{ - std::ostringstream result; - - result << "("; - for (size_t i = 0; i < detector.dimension(); ++i) { - result << detector.getAxis(i).size(); - if (i != detector.dimension() - 1) - result << ","; - } - result << ")"; - - return result.str(); -} - -std::string DetectorFunctions::axesToString(const OutputData<double>& data) -{ - std::ostringstream result; - - result << "("; - for (size_t i = 0; i < data.getRank(); ++i) { - result << data.getAxis(i).size(); - if (i != data.getRank() - 1) - result << ","; - } - result << ")"; - - return result.str(); -} diff --git a/Device/Detector/DetectorFunctions.h b/Device/Detector/DetectorFunctions.h index cb35a0832415a9d178decb6d49cb310bb2e37e2b..f56b1fb0a085c2554b1ca6e654066f8192b655e2 100644 --- a/Device/Detector/DetectorFunctions.h +++ b/Device/Detector/DetectorFunctions.h @@ -33,15 +33,6 @@ namespace DetectorFunctions //! Returns true if the data has same axes size (nx,ny) with the detector. bool hasSameDimensions(const IDetector& detector, const OutputData<double>& data); -// TODO replace two functions below with the template function after change of -// OutputData::getAxis signature - -//! Returns string representation of axes dimension in the form "(nx,ny)" -std::string axesToString(const IDetector& detector); - -//! Returns string representation of axes dimension in the form "(nx,ny)" -std::string axesToString(const OutputData<double>& data); - } // namespace DetectorFunctions #endif // BORNAGAIN_CORE_DETECTOR_DETECTORFUNCTIONS_H diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i index 73e99ab4aee9715af612618399606a611900634f..4438f328cedd2053dde2f69decca488cd761a661 100644 --- a/auto/Wrap/doxygenDevice.i +++ b/auto/Wrap/doxygenDevice.i @@ -3668,16 +3668,6 @@ Parse double values from string to vector of double. Returns true if the data has same axes size (nx,ny) with the detector. "; -%feature("docstring") DetectorFunctions::axesToString "std::string DetectorFunctions::axesToString(const IDetector &detector) - -Returns string representation of axes dimension in the form \"(nx,ny)\". -"; - -%feature("docstring") DetectorFunctions::axesToString "std::string DetectorFunctions::axesToString(const OutputData< double > &data) - -Returns string representation of axes dimension in the form \"(nx,ny)\". -"; - // File: namespaceIntensityDataFunctions.xml %feature("docstring") IntensityDataFunctions::RelativeDifference "double IntensityDataFunctions::RelativeDifference(const SimulationResult &dat, const SimulationResult &ref)