diff --git a/Python code/calcHREELS20.py b/Python code/calcHREELS20.py index eccf213666d30a3b3dcec08890c6acb79e484a1e..60fbce005c8ebdf6e359f8b6a613275b6b5ae110 100755 --- a/Python code/calcHREELS20.py +++ b/Python code/calcHREELS20.py @@ -10,8 +10,10 @@ import scipy.integrate as integrate libDir = os.path.dirname(os.path.realpath(__file__)) try: - from libhreels import myEels20 as LambinEELS # wrapper for myEels20.f90 - from libhreels import myBoson as LambinBoson # wrapper for myBoson.f90 +# from libhreels import myEels20 as LambinEELS # wrapper for myEels20.f90 +# from libhreels import myBoson as LambinBoson # wrapper for myBoson.f90 + import myEels20 as LambinEELS + import myBoson as LambinBoson except: print('myEels20 and MyBoson are not available here (Check your version)') print('''Make sure the Fortran routines 'myEels20' and 'myBoson' diff --git a/Python code/notes.txt b/Python code/notes.txt new file mode 100644 index 0000000000000000000000000000000000000000..286bab18b689c9b61731c0efba46835a891936e1 --- /dev/null +++ b/Python code/notes.txt @@ -0,0 +1,4 @@ +on macos the library reference is wrong. Fix with: + +install_name_tool -change @rpath/libgfortran.5.dylib /opt/local/lib/libgcc/libgfortran.5.dylib myEels20.cpython-312-darwin.so +install_name_tool -change @rpath/libgfortran.5.dylib /opt/local/lib/libgcc/libgfortran.5.dylib myBoson.cpython-312-darwin.so diff --git a/Python code/output/I2L02 .png b/Python code/output/I2L02.png similarity index 100% rename from Python code/output/I2L02 .png rename to Python code/output/I2L02.png diff --git a/Python code/output/calcHREELS20.png b/Python code/output/calcHREELS20.png new file mode 100644 index 0000000000000000000000000000000000000000..ae70f6ee732ef23059caa4f4775c8528010de9dc Binary files /dev/null and b/Python code/output/calcHREELS20.png differ diff --git a/Python code/pyproject.toml b/Python code/pyproject.toml index a2cda9bba2c9e606624dc6ba51fd26978b1c722f..3f4b744fb52fd5f0e4b1c9c62127530aad62e9dc 100644 --- a/Python code/pyproject.toml +++ b/Python code/pyproject.toml @@ -3,35 +3,25 @@ name = "libhreels" version = "2.1.1" description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data" authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"] -include = ["*./libhreels/*"] -exclude = ["./libhreels/eLog*"] +include = ["*.*"] readme = "README.md" -homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" - +#homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" [tool.poetry.dependencies] importlib-metadata = {version = "^1.0", python = "<=3.12"} python = "^3.8" matplotlib = "^3.2" scipy = "^1.4" -#elog = {url = "https://github.com/paulscherrerinstitute/py_elog/archive/master.zip"} requests = "^2.23.0" argparse = "^1.4.0" numpy = "^1.18.2" -#elog = {url = "https://github.com/paulscherrerinstitute/py_elog/archive/master.zip"} [tool.poetry.dev-dependencies] pytest = "^5.2" - [tool.poetry.scripts] dielectrics = "libhreels.dielectrics:myMain" calchreels = "libhreels.calcHREELS20:myMain" -viewhreelstest = "libhreels.ViewHREELS:myMain" - -[tool.poetry.plugins."gui_scripts"] -viewauger = "libhreels.ViewAuger:myMain" -viewhreels = "libhreels.ViewHREELS20:myMain" [build-system] requires = ["poetry>=0.12"]