From 25d30ed9c6f5863257279a0d4a4f116c9cf17595 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 4 Jan 2023 15:11:31 +0100
Subject: [PATCH] camel case -> clonedAxes
---
Base/Axis/Frame.cpp | 2 +-
Base/Axis/Frame.h | 2 +-
Device/Data/Datafield.cpp | 6 +++---
Device/Detector/IDetector.cpp | 2 +-
Device/Histo/DiffUtil.cpp | 2 +-
Sim/Fitting/SimDataPair.cpp | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Base/Axis/Frame.cpp b/Base/Axis/Frame.cpp
index 4e0a931ecef..6bfff0e0740 100644
--- a/Base/Axis/Frame.cpp
+++ b/Base/Axis/Frame.cpp
@@ -29,7 +29,7 @@ Frame::Frame(const std::vector<const IAxis*>& axes)
Frame::~Frame() = default;
-std::vector<const IAxis*> Frame::cloned_axes() const
+std::vector<const IAxis*> Frame::clonedAxes() const
{
return m_axes.cloned_vector();
}
diff --git a/Base/Axis/Frame.h b/Base/Axis/Frame.h
index 904f1eac710..24a3499f745 100644
--- a/Base/Axis/Frame.h
+++ b/Base/Axis/Frame.h
@@ -40,7 +40,7 @@ public:
size_t projectedSize(size_t k_axis) const;
//! Returns cloned axes.
- std::vector<const IAxis*> cloned_axes() const;
+ std::vector<const IAxis*> clonedAxes() const;
//! Returns axis with given serial number
const IAxis& axis(size_t k_axis) const { return *m_axes.at(k_axis); }
diff --git a/Device/Data/Datafield.cpp b/Device/Data/Datafield.cpp
index 98e06cf14b1..5c907667fe5 100644
--- a/Device/Data/Datafield.cpp
+++ b/Device/Data/Datafield.cpp
@@ -63,7 +63,7 @@ Datafield::~Datafield() = default;
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;
}
@@ -191,7 +191,7 @@ Datafield* Datafield::crop(double xmin, double ymin, double xmax, double ymax) c
if (xaxis->contains(x) && yaxis->contains(y))
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
@@ -205,7 +205,7 @@ Datafield* Datafield::crop(double xmin, double xmax) const
if (xaxis->contains(x))
out[iout++] = m_values[i];
}
- return new Datafield(m_frame->cloned_axes(), out);
+ return new Datafield(m_frame->clonedAxes(), out);
}
#ifdef BORNAGAIN_PYTHON
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index a9b943d7fe4..f3f5069ec43 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -174,7 +174,7 @@ void IDetector::applyDetectorResolution(Datafield* intensity_map) const
m_resolution->applyDetectorResolution(intensity_map);
if (detectorMask() && detectorMask()->hasMasks()) {
// 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) {
(*buff)[it.roiIndex()] = (*intensity_map)[it.roiIndex()];
});
diff --git a/Device/Histo/DiffUtil.cpp b/Device/Histo/DiffUtil.cpp
index 2d143eda600..640e31eb448 100644
--- a/Device/Histo/DiffUtil.cpp
+++ b/Device/Histo/DiffUtil.cpp
@@ -42,7 +42,7 @@ Datafield* DiffUtil::relativeDifferenceField(const Datafield& dat, const Datafie
std::vector<double> out(dat.size());
for (size_t i = 0; i < dat.size(); ++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:
diff --git a/Sim/Fitting/SimDataPair.cpp b/Sim/Fitting/SimDataPair.cpp
index 6495f7185a8..cbafacbb67e 100644
--- a/Sim/Fitting/SimDataPair.cpp
+++ b/Sim/Fitting/SimDataPair.cpp
@@ -36,7 +36,7 @@ namespace {
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);
return result;
}
--
GitLab