Skip to content
Snippets Groups Projects
Commit ddbc254c authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

Spherical detector angle ranges fixed

parent 182d86c1
No related branches found
No related tags found
1 merge request!826GUI: instrumental ranges for angles and depth are fixed
Pipeline #63742 failed
......@@ -24,15 +24,17 @@ void AxisProperty::initNbins(const QString& label, const QString& tooltip, uint
void AxisProperty::initMin(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, uint decimals /*= 3*/,
const RealLimits& limits /*= RealLimits::nonnegative()*/)
const variant<QString, Unit>& unit,
const RealLimits& limits /*= RealLimits::nonnegative()*/,
uint decimals /*= 3*/)
{
m_min.init(label, tooltip, value, unit, decimals, limits, "min");
}
void AxisProperty::initMax(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, uint decimals /*= 3*/,
const RealLimits& limits /*= RealLimits::nonnegative()*/)
const variant<QString, Unit>& unit,
const RealLimits& limits /*= RealLimits::nonnegative()*/,
uint decimals /*= 3*/)
{
m_max.init(label, tooltip, value, unit, decimals, limits, "max");
}
......
......@@ -45,11 +45,11 @@ public:
const variant<QString, Unit>& unit = "nbins");
void initMin(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, uint decimals = 3,
const RealLimits& limits = RealLimits::nonnegative());
const variant<QString, Unit>& unit,
const RealLimits& limits = RealLimits::nonnegative(), uint decimals = 3);
void initMax(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, uint decimals = 3,
const RealLimits& limits = RealLimits::nonnegative());
const variant<QString, Unit>& unit,
const RealLimits& limits = RealLimits::nonnegative(), uint decimals = 3);
void serialize(Streamer& s);
......
......@@ -261,8 +261,8 @@ DepthProbeInstrumentItem::DepthProbeInstrumentItem()
axisItem->setBinCount(500);
m_zAxis.initNbins("Nbins", "Number of points in scan across sample bulk");
m_zAxis.initMin("Min", "Starting value below sample horizon", -100.0, Unit::nanometer, 3, RealLimits::limitless());
m_zAxis.initMax("Max", "Ending value above sample horizon", 100.0, Unit::nanometer, 3, RealLimits::limitless());
m_zAxis.initMin("Min", "Starting value below sample horizon", -100.0, Unit::nanometer, RealLimits::limitless());
m_zAxis.initMax("Max", "Ending value above sample horizon", 100.0, Unit::nanometer, RealLimits::limitless());
}
void DepthProbeInstrumentItem::serialize(Streamer& s)
......@@ -418,8 +418,8 @@ ICoordSystem* GISASInstrumentItem::createCoordSystem() const
OffSpecularInstrumentItem::OffSpecularInstrumentItem()
{
m_alphaAxis.initNbins("Nbins", "Number of points in scan");
m_alphaAxis.initMin("Min", "Starting value", 0.0, Unit::degree, 3, RealLimits::limited(0,90));
m_alphaAxis.initMax("Max", "Ending value", 10.0, Unit::degree, 3, RealLimits::limited(0,90));
m_alphaAxis.initMin("Min", "Starting value", 0.0, Unit::degree, RealLimits::limited(-90,90));
m_alphaAxis.initMax("Max", "Ending value", 10.0, Unit::degree, RealLimits::limited(-90,90));
auto* beam_item = dynamic_cast<GISASBeamItem*>(beamItem());
beam_item->setInclinationAngleGetter([=]() { return m_alphaAxis.min(); });
......
......@@ -33,12 +33,12 @@ SphericalDetectorItem::SphericalDetectorItem()
initResolutionFunction);
m_phiAxis.initNbins("Nbins", "Number of phi-axis bins");
m_phiAxis.initMin("Min", "Lower edge of first phi-bin", -1.0, Unit::degree);
m_phiAxis.initMax("Max", "Upper edge of last phi-bin", 1.0, Unit::degree);
m_phiAxis.initMin("Min", "Lower edge of first phi-bin", -1.0, Unit::degree, RealLimits::limited(-90,90));
m_phiAxis.initMax("Max", "Upper edge of last phi-bin", 1.0, Unit::degree, RealLimits::limited(-90,90));
m_alphaAxis.initNbins("Nbins", "Number of alpha-axis bins");
m_alphaAxis.initMin("Min", "Lower edge of first alpha-bin", 0.0, Unit::degree);
m_alphaAxis.initMax("Max", "Upper edge of last alpha-bin", 2.0, Unit::degree);
m_alphaAxis.initMin("Min", "Lower edge of first alpha-bin", 0.0, Unit::degree, RealLimits::limited(-90,90));
m_alphaAxis.initMax("Max", "Upper edge of last alpha-bin", 2.0, Unit::degree, RealLimits::limited(-90,90));
}
void SphericalDetectorItem::serialize(Streamer& s)
......
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