diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp index f2a41d1c272695b290a839cd02c4f8b99b950404..3d82b6700e5dbf2be1451834d536b4c16033da47 100644 --- a/Core/Simulation/SpecularSimulation.cpp +++ b/Core/Simulation/SpecularSimulation.cpp @@ -190,9 +190,9 @@ void SpecularSimulation::addParameterDistribution(const ParameterDistribution& p Simulation::addParameterDistribution(par_distr); } -Histogram1D* SpecularSimulation::getIntensityData() const +Histogram1D* SpecularSimulation::getIntensityData(AxesUnits units_type) const { - std::unique_ptr<OutputData<double>> result(getDetectorIntensity()); + std::unique_ptr<OutputData<double>> result(getDetectorIntensity(units_type)); return new Histogram1D(*result); } diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h index c6bdf413dc5a2543edbd316be59842d81430809f..aa617c799d79a363b89eb39d6f1d6d8424861ecf 100644 --- a/Core/Simulation/SpecularSimulation.h +++ b/Core/Simulation/SpecularSimulation.h @@ -66,7 +66,7 @@ public: void addParameterDistribution(const ParameterDistribution& par_distr) override; //! Returns detector signal (\f$ \propto |R|^2\f$) in the form of 1D Histogram - Histogram1D* getIntensityData() const; + Histogram1D* getIntensityData(AxesUnits units_type = AxesUnits::DEFAULT) const; private: typedef complex_t (ILayerRTCoefficients::*DataGetter)() const; diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i index e484d3081d9c9b045352a33894f062bbb8e69e76..6110d5946bdfa7eb1b334e80aaf32eedf69a71e3 100644 --- a/Wrap/swig/libBornAgainCore.i +++ b/Wrap/swig/libBornAgainCore.i @@ -232,8 +232,7 @@ %newobject OffSpecSimulation::getDetectorIntensity(AxesUnits units_type = AxesUnits::DEFAULT) const; %newobject SpecularSimulation::getDetectorIntensity(AxesUnits units_type = AxesUnits::DEFAULT) const; -%newobject SpecularSimulation::reflectivity() const; -%newobject SpecularSimulation::transmissivity() const; +%newobject SpecularSimulation::getIntensityData(AxesUnits units_type = AxesUnits::DEFAULT) const; %newobject IntensityDataIOFactory::readOutputData(const std::string& file_name); %newobject IntensityDataIOFactory::readIntensityData(const std::string& file_name);