Merge branch 'development' into enhancement/install_demos

README.md

@@ -35,17 +35,13 @@ pip install cherab-solps
 This module depends on the core Cherab framework.
 Cherab core, and all of its dependencies, are available on PyPI and can be installed using `pip`.
 
-Note also that a [bug](https://github.com/cython/cython/issues/2918) in Cython prevents Cherab submodules from installing correctly.
-This bug is fixed, but not yet released in the stable version of Cython.
-As a result, you will need to install a pre-release version of Cython before installing this package.
 Recent versions of `pip` which support [PEP 518](https://www.python.org/dev/peps/pep-0518/) will handle this automatically when you run `pip install cherab-solps` and a binary wheel is not available for your platform or Python version.
 
 For older versions of `pip` you may need to manually install the build-time dependencies.
 First, clone this repository, then do:
 
 ```bash
-pip install -U cython==3.0a5
-pip install cherab
+pip install -r <path-to-cherab-solps>/requirements.txt
 pip install <path-to-cherab-solps>
 ```
 

cherab/solps/models/line_emitter.pyx

@@ -103,7 +103,7 @@ cdef class SOLPSLineEmitter(PlasmaModel):
         self._wavelength = self._atomic_data.wavelength(self._line.element, self._line.charge, self._line.transition)
 
         # instance line shape renderer
-        self._lineshape = self._lineshape_class(self._line, self._wavelength, self._target_species, self._plasma,
+        self._lineshape = self._lineshape_class(self._line, self._wavelength, self._target_species, self._plasma, self._atomic_data,
                                                 *self._lineshape_args, **self._lineshape_kwargs)
 
     def _change(self):