Skip to content
Snippets Groups Projects
Commit 25d30ed9 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

camel case -> clonedAxes

parent 275e37d2
No related branches found
No related tags found
1 merge request!1240change some fct names to camel case; rm sone unused fcts; relegate ad-hoc minus sign to vecOfLambdaAlphaPhi
...@@ -29,7 +29,7 @@ Frame::Frame(const std::vector<const IAxis*>& axes) ...@@ -29,7 +29,7 @@ Frame::Frame(const std::vector<const IAxis*>& axes)
Frame::~Frame() = default; Frame::~Frame() = default;
std::vector<const IAxis*> Frame::cloned_axes() const std::vector<const IAxis*> Frame::clonedAxes() const
{ {
return m_axes.cloned_vector(); return m_axes.cloned_vector();
} }
......
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
size_t projectedSize(size_t k_axis) const; size_t projectedSize(size_t k_axis) const;
//! Returns cloned axes. //! Returns cloned axes.
std::vector<const IAxis*> cloned_axes() const; std::vector<const IAxis*> clonedAxes() const;
//! Returns axis with given serial number //! Returns axis with given serial number
const IAxis& axis(size_t k_axis) const { return *m_axes.at(k_axis); } const IAxis& axis(size_t k_axis) const { return *m_axes.at(k_axis); }
......
...@@ -63,7 +63,7 @@ Datafield::~Datafield() = default; ...@@ -63,7 +63,7 @@ Datafield::~Datafield() = default;
Datafield* Datafield::clone() const Datafield* Datafield::clone() const
{ {
auto* data = new Datafield(m_frame->cloned_axes(), m_values, m_errSigmas); auto* data = new Datafield(m_frame->clonedAxes(), m_values, m_errSigmas);
return data; return data;
} }
...@@ -191,7 +191,7 @@ Datafield* Datafield::crop(double xmin, double ymin, double xmax, double ymax) c ...@@ -191,7 +191,7 @@ Datafield* Datafield::crop(double xmin, double ymin, double xmax, double ymax) c
if (xaxis->contains(x) && yaxis->contains(y)) if (xaxis->contains(x) && yaxis->contains(y))
out[iout++] = m_values[i]; out[iout++] = m_values[i];
} }
return new Datafield(m_frame->cloned_axes(), out); return new Datafield(m_frame->clonedAxes(), out);
} }
Datafield* Datafield::crop(double xmin, double xmax) const Datafield* Datafield::crop(double xmin, double xmax) const
...@@ -205,7 +205,7 @@ Datafield* Datafield::crop(double xmin, double xmax) const ...@@ -205,7 +205,7 @@ Datafield* Datafield::crop(double xmin, double xmax) const
if (xaxis->contains(x)) if (xaxis->contains(x))
out[iout++] = m_values[i]; out[iout++] = m_values[i];
} }
return new Datafield(m_frame->cloned_axes(), out); return new Datafield(m_frame->clonedAxes(), out);
} }
#ifdef BORNAGAIN_PYTHON #ifdef BORNAGAIN_PYTHON
......
...@@ -174,7 +174,7 @@ void IDetector::applyDetectorResolution(Datafield* intensity_map) const ...@@ -174,7 +174,7 @@ void IDetector::applyDetectorResolution(Datafield* intensity_map) const
m_resolution->applyDetectorResolution(intensity_map); m_resolution->applyDetectorResolution(intensity_map);
if (detectorMask() && detectorMask()->hasMasks()) { if (detectorMask() && detectorMask()->hasMasks()) {
// sets amplitude in masked areas to zero // sets amplitude in masked areas to zero
std::unique_ptr<Datafield> buff(new Datafield(intensity_map->frame().cloned_axes())); std::unique_ptr<Datafield> buff(new Datafield(intensity_map->frame().clonedAxes()));
iterateOverNonMaskedPoints([&](const_iterator it) { iterateOverNonMaskedPoints([&](const_iterator it) {
(*buff)[it.roiIndex()] = (*intensity_map)[it.roiIndex()]; (*buff)[it.roiIndex()] = (*intensity_map)[it.roiIndex()];
}); });
......
...@@ -42,7 +42,7 @@ Datafield* DiffUtil::relativeDifferenceField(const Datafield& dat, const Datafie ...@@ -42,7 +42,7 @@ Datafield* DiffUtil::relativeDifferenceField(const Datafield& dat, const Datafie
std::vector<double> out(dat.size()); std::vector<double> out(dat.size());
for (size_t i = 0; i < dat.size(); ++i) for (size_t i = 0; i < dat.size(); ++i)
out[i] = Numeric::relativeDifference(dat.valAt(i), ref.valAt(i)); out[i] = Numeric::relativeDifference(dat.valAt(i), ref.valAt(i));
return new Datafield(dat.frame().cloned_axes(), out); return new Datafield(dat.frame().clonedAxes(), out);
} }
//! Returns sum of relative differences between each pair of elements: //! Returns sum of relative differences between each pair of elements:
......
...@@ -36,7 +36,7 @@ namespace { ...@@ -36,7 +36,7 @@ namespace {
std::unique_ptr<Datafield> initUserWeights(const Datafield& shape, double value) std::unique_ptr<Datafield> initUserWeights(const Datafield& shape, double value)
{ {
auto result = std::make_unique<Datafield>(shape.frame().cloned_axes()); auto result = std::make_unique<Datafield>(shape.frame().clonedAxes());
result->setAllTo(value); result->setAllTo(value);
return result; return result;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment