rm beam from OffspecSim

Sim/Simulation/OffspecSimulation.cpp

@@ -17,7 +17,6 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Pixel/IPixel.h"
 #include "Base/Util/Assert.h"
-#include "Device/Beam/Beam.h"
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Detector/OffspecDetector.h"
@@ -34,7 +33,6 @@ OffspecSimulation::OffspecSimulation(const IBeamScan& scan, const MultiLayer& sa
                                      const OffspecDetector& detector)
     : ISimulation(sample)
     , m_scan(scan.clone())
-    , m_beam(InBeam(scan.intensity(), scan.wavelength(), 0., 0.).clone())
     , m_detector(detector.clone())
     , m_alpha_i_axis(scan.coordinateAxis()->clone())
 {

Sim/Simulation/OffspecSimulation.h

@@ -40,7 +40,6 @@ public:
     std::string className() const final { return "OffspecSimulation"; }
 
     OffspecDetector& detector() { return *m_detector; }
-    const Beam& beam() const { return *m_beam; }
 #ifndef SWIG
     const ICoordSystem* simCoordSystem() const override;
 
@@ -76,7 +75,6 @@ private:
 
     //... Model components:
     std::unique_ptr<IBeamScan> m_scan;
-    std::shared_ptr<Beam> m_beam;
     std::unique_ptr<OffspecDetector> m_detector;
 
     //... Caches:

auto/Wrap/libBornAgainSim.py

@@ -2777,10 +2777,6 @@ class OffspecSimulation(ISimulation):
         r"""detector(OffspecSimulation self) -> OffspecDetector &"""
         return _libBornAgainSim.OffspecSimulation_detector(self)
 
-    def beam(self):
-        r"""beam(OffspecSimulation self) -> Beam const &"""
-        return _libBornAgainSim.OffspecSimulation_beam(self)
-
 # Register OffspecSimulation in _libBornAgainSim:
 _libBornAgainSim.OffspecSimulation_swigregister(OffspecSimulation)
 class IBackground(libBornAgainBase.ICloneable, libBornAgainParam.INode):

auto/Wrap/libBornAgainSim_wrap.cpp

@@ -33737,29 +33737,6 @@ fail:
 }
-SWIGINTERN PyObject *_wrap_OffspecSimulation_beam(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  OffspecSimulation *arg1 = (OffspecSimulation *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  Beam *result = 0 ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffspecSimulation, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffspecSimulation_beam" "', argument " "1"" of type '" "OffspecSimulation const *""'"); 
-  }
-  arg1 = reinterpret_cast< OffspecSimulation * >(argp1);
-  result = (Beam *) &((OffspecSimulation const *)arg1)->beam();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Beam, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *OffspecSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
@@ -36226,7 +36203,6 @@ static PyMethodDef SwigMethods[] = {
 	 { "delete_OffspecSimulation", _wrap_delete_OffspecSimulation, METH_O, "delete_OffspecSimulation(OffspecSimulation self)"},
 	 { "OffspecSimulation_className", _wrap_OffspecSimulation_className, METH_O, "OffspecSimulation_className(OffspecSimulation self) -> std::string"},
 	 { "OffspecSimulation_detector", _wrap_OffspecSimulation_detector, METH_O, "OffspecSimulation_detector(OffspecSimulation self) -> OffspecDetector &"},
-	 { "OffspecSimulation_beam", _wrap_OffspecSimulation_beam, METH_O, "OffspecSimulation_beam(OffspecSimulation self) -> Beam const &"},
 	 { "OffspecSimulation_swigregister", OffspecSimulation_swigregister, METH_O, NULL},
 	 { "OffspecSimulation_swiginit", OffspecSimulation_swiginit, METH_VARARGS, NULL},
 	 { "delete_IBackground", _wrap_delete_IBackground, METH_O, "delete_IBackground(IBackground self)"},