rm old fcts

GUI/Model/Device/BeamItems.cpp

@@ -145,12 +145,6 @@ void BeamItem::setInclinationAngle(double value)
     m_inclinationAngleItem->resetToValue(value);
 }
 
-BeamDistributionItem* BeamItem::inclinationAngleItem() const
-{
-    ASSERT(m_inclinationAngleItem);
-    return m_inclinationAngleItem.get();
-}
-
 BeamDistributionItem* BeamItem::beamDistributionItem() const
 {
     ASSERT(m_inclinationAngleItem);
@@ -258,12 +252,6 @@ void ScanItem::setInclinationAngle(double value)
     BeamItem::setInclinationAngle(value);
 }
 
-GrazingScanItem* ScanItem::inclinationAngleItem() const
-{
-    ASSERT(m_inclinationAngleItem);
-    return dynamic_cast<GrazingScanItem*>(m_inclinationAngleItem.get());
-}
-
 GrazingScanItem* ScanItem::grazingScanItem() const
 {
     ASSERT(m_inclinationAngleItem);

GUI/Model/Device/BeamItems.h

@@ -48,7 +48,7 @@ public:
 
     virtual double getInclinationAngle() const = 0;
     virtual void setInclinationAngle(double value);
-    virtual BeamDistributionItem* inclinationAngleItem() const;
+
     BeamDistributionItem* beamDistributionItem() const;
 
     double azimuthalAngle() const;
@@ -80,7 +80,7 @@ public:
 
     double getInclinationAngle() const override;
     void setInclinationAngle(double value) override;
-    GrazingScanItem* inclinationAngleItem() const override;
+
     GrazingScanItem* grazingScanItem() const;
     BasicAxisItem* inclinationAxisItem() const;
 

GUI/Model/Device/InstrumentItems.cpp

@@ -319,14 +319,14 @@ bool SpecularInstrumentItem::alignedWith(const RealItem* item) const
 {
     const QString native_units = item->nativeDataUnits();
     if (native_units == "nbins")
-        return beamItem()->inclinationAngleItem()->uniformAlphaAxisSelected()
+        return beamItem()->grazingScanItem()->uniformAlphaAxisSelected()
                && shape() == item->shape();
 
-    if (!beamItem()->inclinationAngleItem()->pointwiseAlphaAxisSelected())
+    if (!beamItem()->grazingScanItem()->pointwiseAlphaAxisSelected())
         return false;
 
     const auto* axisItem =
-        dynamic_cast<const PointwiseAxisItem*>(beamItem()->inclinationAngleItem()->alphaAxisItem());
+        dynamic_cast<const PointwiseAxisItem*>(beamItem()->grazingScanItem()->alphaAxisItem());
     ASSERT(axisItem);
 
     if (axisItem->nativeAxisUnits() != native_units)
@@ -400,7 +400,7 @@ ISimulation* SpecularInstrumentItem::createSimulation(const MultiLayer& sample)
     }
 
     {
-        const auto* it = dynamic_cast<const GrazingScanItem*>(beamItem()->inclinationAngleItem());
+        const auto* it = dynamic_cast<const GrazingScanItem*>(beamItem()->grazingScanItem());
         ASSERT(it);
         const auto* distr_item =
             dynamic_cast<const SymmetricResolutionItem*>(it->distributionItem());
@@ -505,8 +505,8 @@ ISimulation* DepthprobeInstrumentItem::createSimulation(const MultiLayer& sample
 
     setBeamDistribution(ParameterDistribution::BeamWavelength, beamItem()->wavelengthItem(),
                         result);
-    setBeamDistribution(ParameterDistribution::BeamInclinationAngle,
-                        beamItem()->inclinationAngleItem(), result);
+    setBeamDistribution(ParameterDistribution::BeamInclinationAngle, beamItem()->grazingScanItem(),
+                        result);
 
     m_coosys.reset(result->simCoordSystem());
     return result;
@@ -759,7 +759,7 @@ ISimulation* GISASInstrumentItem::createSimulation(const MultiLayer& sample) con
     setBeamDistribution(ParameterDistribution::BeamWavelength, beamItem()->wavelengthItem(),
                         result);
     setBeamDistribution(ParameterDistribution::BeamInclinationAngle,
-                        beamItem()->inclinationAngleItem(), result);
+                        beamItem()->beamDistributionItem(), result);
     setBeamDistribution(ParameterDistribution::BeamAzimuthalAngle, beamItem()->azimuthalAngleItem(),
                         result);