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

express newX fct by X

parent 7318029c
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,7 @@ Scale* newGenericScale(const std::string& name, const std::vector<double>& limit ...@@ -55,6 +55,7 @@ Scale* newGenericScale(const std::string& name, const std::vector<double>& limit
return new Scale(name, limits2bins(limits)); return new Scale(name, limits2bins(limits));
} }
Scale ListScan(const std::string& name, const std::vector<double>& points) Scale ListScan(const std::string& name, const std::vector<double>& points)
{ {
return Scale(name, centers2bins(points)); return Scale(name, centers2bins(points));
...@@ -62,7 +63,7 @@ Scale ListScan(const std::string& name, const std::vector<double>& points) ...@@ -62,7 +63,7 @@ Scale ListScan(const std::string& name, const std::vector<double>& points)
Scale* newListScan(const std::string& name, const std::vector<double>& points) Scale* newListScan(const std::string& name, const std::vector<double>& points)
{ {
return new Scale(name, centers2bins(points)); return new Scale(ListScan(name, points));
} }
...@@ -73,7 +74,7 @@ Scale EquiDivision(const std::string& name, size_t nbins, double start, double e ...@@ -73,7 +74,7 @@ Scale EquiDivision(const std::string& name, size_t nbins, double start, double e
Scale* newEquiDivision(const std::string& name, size_t nbins, double start, double end) Scale* newEquiDivision(const std::string& name, size_t nbins, double start, double end)
{ {
return new Scale(name, bounds2division(nbins, start, end)); return new Scale(EquiDivision(name, nbins, start, end));
} }
std::shared_ptr<Scale> sharedEquiDivision(const std::string& name, size_t nbins, double start, std::shared_ptr<Scale> sharedEquiDivision(const std::string& name, size_t nbins, double start,
...@@ -92,17 +93,14 @@ std::unique_ptr<Scale> uniqueEquiDivision(const std::string& name, size_t nbins, ...@@ -92,17 +93,14 @@ std::unique_ptr<Scale> uniqueEquiDivision(const std::string& name, size_t nbins,
Scale EquiScan(const std::string& name, size_t nbins, double start, double end) Scale EquiScan(const std::string& name, size_t nbins, double start, double end)
{ {
if (nbins < 2) if (nbins < 2)
throw std::runtime_error("Cannot create scan axis with less than two points"); throw std::runtime_error("Cannot scan axis with less than two points");
const double delta = (end - start) / (nbins - 1); const double delta = (end - start) / (nbins - 1);
return EquiDivision(name, nbins, start - delta / 2, end + delta / 2); return EquiDivision(name, nbins, start - delta / 2, end + delta / 2);
} }
Scale* newEquiScan(const std::string& name, size_t nbins, double start, double end) Scale* newEquiScan(const std::string& name, size_t nbins, double start, double end)
{ {
if (nbins < 2) return new Scale(EquiScan(name, nbins, start, end));
throw std::runtime_error("Cannot create scan axis with less than two points");
const double delta = (end - start) / (nbins - 1);
return newEquiDivision(name, nbins, start - delta / 2, end + delta / 2);
} }
std::shared_ptr<Scale> sharedEquiScan(const std::string& name, size_t nbins, double start, std::shared_ptr<Scale> sharedEquiScan(const std::string& name, size_t nbins, double start,
......
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