Merge branch 'dev0'

docs/conf.py

@@ -22,7 +22,7 @@ copyright = '2020, Nikolay Ivanov'
 author = 'Nikolay Ivanov'
 
 # The full version, including alpha/beta/rc tags
-release = '0.3.0'
+release = '0.3.1'
 
 
 # -- General configuration ---------------------------------------------------

pyrost/simulation/st_sim.py

@@ -14,7 +14,7 @@ Perform the simulation for a given :class:`pyrost.simulation.STParams` object.
 
 >>> import pyrost.simulation as st_sim
 >>> st_params = st_sim.parameters()
->>> sim_obj = st_sim.STSim(params=st_params)
+>>> sim_obj = st_sim.STSim(st_params)
 
 Return an array of intensity frames at the detector's plane.
 
@@ -91,7 +91,8 @@ class STSim(DataContainer):
     init_set = {'b_steps', 'b_profile', 'det_wfx', 'det_wfy', 'det_ix', 'det_iy',
                 'lens_wfx', 'lens_wfy','n_x', 'n_y', 'sample_wfx', 'sample_wfy'}
 
-    def __init__(self, **kwargs):
+    def __init__(self, params, **kwargs):
+        kwargs['params'] = params
         super(STSim, self).__init__(**kwargs)
         self._init_dict()
 
@@ -466,7 +467,7 @@ def main():
         st_params = STParams.import_dict(**args)
 
     st_converter = STConverter()
-    sim_obj = STSim(params=st_params)
+    sim_obj = STSim(st_params)
     if args['ptych']:
         data = sim_obj.ptychograph()
     else:

setup.py

@@ -39,7 +39,7 @@ with open('README.md', 'r') as readme:
     long_description = readme.read()
 
 setup(name='pyrost',
-      version='0.3.0',
+      version='0.3.1',
       author='Nikolay Ivanov',
       author_email="nikolay.ivanov@desy.de",
       long_description=long_description,

tests/test_pyrost.py

@@ -75,8 +75,8 @@ def test_st_params(st_params, ini_path):
 
 @pytest.mark.st_sim
 def test_st_sim(st_params):
-    with st_sim.STSim(st_params) as sim_obj:
-        ptych = sim_obj.ptychograph()
+    sim_obj = st_sim.STSim(st_params)
+    ptych = sim_obj.ptychograph()
     assert len(ptych.shape) == 3
     assert ptych.shape[0] == st_params.n_frames
 
@@ -119,9 +119,9 @@ def test_data_process_routines(exp_data_2d, loader):
 
 @pytest.mark.standalone
 def test_full(st_params, converter):
-    with st_sim.STSim(st_params) as sim_obj:
-        ptych = sim_obj.ptychograph()
-        data = converter.export_data(ptych, st_params)
+    sim_obj = st_sim.STSim(st_params)
+    ptych = sim_obj.ptychograph()
+    data = converter.export_data(ptych, st_params)
     assert data.data.dtype == converter.protocol.known_types['float']
     st_obj = data.get_st()
     st_res = st_obj.iter_update(sw_fs=20, ls_pm=3, ls_ri=5,