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

disambiguate fct -> centralValue

parent 19154b9f
No related branches found
No related tags found
1 merge request!2692rm class GrazingScanItem (#567b)
......@@ -50,12 +50,9 @@ void BeamDistributionItem::readFrom(QXmlStreamReader* r)
}
}
double BeamDistributionItem::meanValue() const
double BeamDistributionItem::centralValue() const
{
std::unique_ptr<IDistribution1D> domainDistr = distributionItem()->createDistribution(1.);
if (domainDistr)
return domainDistr->mean();
return dynamic_cast<SymmetricDistributionItem*>(distributionItem())->mean().dVal();
return distributionItem()->center().dVal();
}
void BeamDistributionItem::resetToValue(double value)
......
......@@ -31,7 +31,7 @@ public:
virtual void writeTo(QXmlStreamWriter* w) const;
virtual void readFrom(QXmlStreamReader* r);
virtual double meanValue() const;
virtual double centralValue() const;
void resetToValue(double value);
virtual double scaleFactor() const;
......
......@@ -201,9 +201,9 @@ BeamDistributionItem* BeamItem::inclinationAngleItem() const
std::unique_ptr<Beam> BeamItem::createBeam() const
{
double lambda = wavelengthItem()->meanValue();
double inclination_angle = Units::deg2rad(inclinationAngleItem()->meanValue());
double azimuthal_angle = Units::deg2rad(azimuthalAngleItem()->meanValue());
double lambda = wavelengthItem()->centralValue();
double inclination_angle = Units::deg2rad(inclinationAngleItem()->centralValue());
double azimuthal_angle = Units::deg2rad(azimuthalAngleItem()->centralValue());
auto result =
std::make_unique<Beam>(intensity().dVal(), lambda, inclination_angle, azimuthal_angle);
......
......@@ -191,7 +191,7 @@ std::unique_ptr<PhysicalScan> ScanningInstrumentItem::createScan(const Scale& ax
auto result = std::make_unique<AlphaScan>(axis);
result->setIntensity(scanItem()->intensity().dVal());
result->setWavelength(scanItem()->wavelengthItem()->meanValue());
result->setWavelength(scanItem()->wavelengthItem()->centralValue());
FootprintCatalog::BaseItem* const footprint_item =
scanItem()->footprintSelection().certainItem();
......@@ -456,7 +456,7 @@ std::unique_ptr<Frame> SpecularInstrumentItem::createFrame() const
return {};
if (pAxis->unit() == "1/nm") {
double lambda = scanItem()->wavelengthItem()->meanValue();
double lambda = scanItem()->wavelengthItem()->centralValue();
Scale ax =
pAxis->transformedScale(Coordinate("alpha_i", "rad").label(), [lambda](double qz) {
return std::asin(qz * lambda / 4 / pi);
......
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