rm fct

Core/Simulation/ISimulation.cpp

@@ -129,14 +129,6 @@ void ISimulation::initialize()
     registerChild(&m_sample_provider);
 }
 
-#ifndef SWIG
-void ISimulation::setInstrument(const Instrument& instrument_)
-{
-    m_instrument = instrument_;
-    updateIntensityMap();
-}
-#endif // SWIG
-
 //! Initializes a progress monitor that prints to stdout.
 void ISimulation::setTerminalProgressMonitor()
 {

Core/Simulation/ISimulation.h

@@ -98,7 +98,6 @@ public:
 
 #ifndef SWIG
     ISimulation(const Beam& beam, const IDetector& detector);
-    void setInstrument(const Instrument& instrument_);
     virtual ICoordSystem* createCoordSystem() const = 0;
 #endif // SWIG
 

Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp

@@ -96,9 +96,6 @@ TEST_F(DepthProbeSimulationTest, SetBeamParameters)
 
     checkBeamState(sim);
 
-    sim.beam().setIntensity(2.0);
-    EXPECT_EQ(2.0, beam.intensity());
-
     EXPECT_THROW(sim.setBeamParameters(1.0, 10, -2.0, 3.0), std::runtime_error);
     EXPECT_THROW(sim.setBeamParameters(1.0, 10, 2.0, 1.0), std::runtime_error);
     EXPECT_THROW(sim.setBeamParameters(1.0, 0, 1.0, 2.0), std::runtime_error);
@@ -107,16 +104,11 @@ TEST_F(DepthProbeSimulationTest, SetBeamParameters)
     EXPECT_EQ(10u, sim.getAlphaAxis()->size());
     EXPECT_EQ(1.0 * Units::deg, sim.getAlphaAxis()->lowerBound());
     EXPECT_EQ(10.0 * Units::deg, sim.getAlphaAxis()->upperBound());
-    EXPECT_EQ(2.0, beam.intensity());
     EXPECT_EQ(1.0, beam.wavelength());
     EXPECT_EQ(0.0, beam.direction().alpha());
     EXPECT_EQ(0.0, beam.direction().phi());
 
     checkBeamState(sim);
-
-    sim.setInstrument(Instrument());
-
-    checkBeamState(sim);
 }
 
 TEST_F(DepthProbeSimulationTest, ResultAquisition)

Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp

@@ -72,16 +72,12 @@ TEST_F(SpecularSimulationTest, SetAngularScan)
     EXPECT_EQ(0.0, beam.direction().alpha());
     EXPECT_EQ(0.0, beam.direction().phi());
 
-    sim.beam().setIntensity(2.0);
-    EXPECT_EQ(2.0, beam.intensity());
-
     SpecularSimulation sim2;
     AngularSpecScan scan2(1.0, 10, 1.0 * Units::deg, 10.0 * Units::deg);
     sim2.setScan(scan2);
     EXPECT_EQ(10u, sim2.coordinateAxis()->size());
     EXPECT_EQ(1.0 * Units::deg, sim2.coordinateAxis()->lowerBound());
     EXPECT_EQ(10.0 * Units::deg, sim2.coordinateAxis()->upperBound());
-    EXPECT_EQ(2.0, beam.intensity());
     EXPECT_EQ(1.0, beam.wavelength());
     EXPECT_EQ(0.0, beam.direction().alpha());
     EXPECT_EQ(0.0, beam.direction().phi());
@@ -94,13 +90,10 @@ TEST_F(SpecularSimulationTest, SetAngularScan)
     EXPECT_EQ(10u, sim2.coordinateAxis()->size());
     EXPECT_EQ(1.0 * Units::deg, sim2.coordinateAxis()->lowerBound());
     EXPECT_EQ(10.0 * Units::deg, sim2.coordinateAxis()->upperBound());
-    EXPECT_EQ(2.0, beam.intensity());
     EXPECT_EQ(1.0, beam.wavelength());
     EXPECT_EQ(0.0, beam.direction().alpha());
     EXPECT_EQ(0.0, beam.direction().phi());
 
-    sim3.setInstrument(Instrument());
-
     SpecularSimulation sim4;
     AngularSpecScan scan4(1.0, 10, .0 * Units::deg, 2.0 * Units::deg);
     const auto polarization = kvector_t({0., 0., 0.876});

auto/Wrap/doxygenCore.i

@@ -1040,9 +1040,6 @@ Initializes a progress monitor that prints to stdout.
 %feature("docstring")  ISimulation::ISimulation "ISimulation::ISimulation(const Beam &beam, const IDetector &detector)
 ";
 
-%feature("docstring")  ISimulation::setInstrument "void ISimulation::setInstrument(const Instrument &instrument_)
-";
-
 %feature("docstring")  ISimulation::createCoordSystem "virtual ICoordSystem* ISimulation::createCoordSystem() const =0
 ";