Merge tag '1.7.post11' into devel

1.7.post11
This commit is contained in:
Sylvain Tricot 2022-10-05 13:55:33 +02:00
commit c0d5e97b35
5 changed files with 17 additions and 9 deletions

View File

@ -32,6 +32,11 @@ devel: venv pybinding wx
@$(INSIDE_VENV) pip install -e src/ @$(INSIDE_VENV) pip install -e src/
light: VENV_PATH = ./_venv
light: venv
@$(INSIDE_VENV) pip install src/
_build_wx/wxPython.target: _build_wx/wxPython.target:
@$(INSIDE_VENV) echo "Building wxPython for your `python --version 2>&1` under Linux $(DISTRO_RELEASE)..." @$(INSIDE_VENV) echo "Building wxPython for your `python --version 2>&1` under Linux $(DISTRO_RELEASE)..."
# Create a folder to build wx into # Create a folder to build wx into

View File

@ -385,7 +385,7 @@ class _MSCALCULATOR(Calculator):
'NODES_EX_M' : 3, 'NODES_EX_M' : 3,
'NSPIN_M' : 1, # to change for spin dependent 'NSPIN_M' : 1, # to change for spin dependent
'NTH_M' : 2000, 'NTH_M' : 2000,
'NPH_M' : 2000, 'NPH_M' : 8000,
'NDIM_M' : 100000, 'NDIM_M' : 100000,
'N_TILT_M' : 11, # to change see extdir.f 'N_TILT_M' : 11, # to change see extdir.f
'N_ORD_M' : 250, 'N_ORD_M' : 250,
@ -654,12 +654,12 @@ class _PED(_MSCALCULATOR):
self.spectroscopy_parameters.set_parameter('level', level) self.spectroscopy_parameters.set_parameter('level', level)
# It is still possible to change any parameter right before # It is still possible to modify any option right before runing phagen
# runing Phagen or Spec # and spec
for k, v in other_parameters.items(): for k, v in other_parameters.items():
grp_str, parma_str = k.split('.') grp_str, param_str = k.split('.')
grp = getattr(self, grp_str) grp = getattr(self, grp_str)
grp.set_parameter(parma_str, v, force=True) grp.set_parameter(param_str, v, force=True)
self.get_tmatrix() self.get_tmatrix()
self.run_spec(malloc) self.run_spec(malloc)
@ -885,8 +885,7 @@ class _PED(_MSCALCULATOR):
return data return data
def get_theta_scan(self, phi=0, theta=np.linspace(-70, 70, 141), def get_theta_scan(self, phi=0, theta=np.linspace(-70, 70, 141),
level=None, kinetic_energy=None, data=None, level=None, kinetic_energy=None, data=None, **kwargs):
**kwargs):
"""Computes a polar scan of the emitted photoelectrons. """Computes a polar scan of the emitted photoelectrons.
:param phi: The azimuthal angle in degrees. See :param phi: The azimuthal angle in degrees. See

View File

@ -39,7 +39,11 @@ import ase.atom
from ase import Atom from ase import Atom
from ase import Atoms from ase import Atoms
try:
from msspec.iodata import Data from msspec.iodata import Data
except ImportError as err:
print(err)
from msspec.misc import LOGGER from msspec.misc import LOGGER

View File

@ -2,7 +2,7 @@ ase
h5py h5py
ipython ipython
lxml lxml
matplotlib matplotlib==3.4.3
numpy numpy
Pint Pint
pandas pandas

0
utils/dockerized/linux/msspec Normal file → Executable file
View File