diff --git a/libhreels/HREELS.py b/libhreels/HREELS.py index ed6fd03d148584daa029438dc0a398662d944ffb..1dd36e1d7859422433f3f1cd8a4eedb30c1ce647 100644 --- a/libhreels/HREELS.py +++ b/libhreels/HREELS.py @@ -3,7 +3,6 @@ # import numpy as np import re -# import elog import os import matplotlib.pyplot as plt from scipy import optimize diff --git a/libhreels/NoExpLogbook.py b/libhreels/NoExpLogbook.py index 2dd44dc8e5bbe6915441e4c17ab60f9dcad898e6..5eff614bdb0e57f92c1051faed13a3b79c7565c7 100644 --- a/libhreels/NoExpLogbook.py +++ b/libhreels/NoExpLogbook.py @@ -1,2 +1,2 @@ -available = False - +available = False + diff --git a/libhreels/ViewHREELS.py b/libhreels/ViewHREELS.py index 800ada17cb943591ab640cb64583068f154827e6..4fdca545149a14b03a58056de7b5566b831cb7a1 100644 --- a/libhreels/ViewHREELS.py +++ b/libhreels/ViewHREELS.py @@ -15,8 +15,8 @@ hhPath = os.path.dirname(__file__) from libhreels.HREELS import HREELS, myPath from datetime import datetime import argparse -import libhreels.expLogbook as lgb -# import libhreels.NoExpLogbook as lgb +# import libhreels.expLogbook as lgb +import libhreels.NoExpLogbook as lgb # fix HighRes Displays QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True) diff --git a/libhreels/__init__.py b/libhreels/__init__.py index 382021f30ff6ce35872aa0de4ebe2a43f50c21d7..e13bd590c858eab2ba3506af867008063b736c2e 100644 --- a/libhreels/__init__.py +++ b/libhreels/__init__.py @@ -1 +1 @@ -__version__ = "1.0.6" +__version__ = "1.0.8" diff --git a/libhreels/materials.json b/libhreels/materials.json index 3121c3eb5c3819f4c694a5c20205843c85f5932c..02518d7fed00d079c21a93c412d12297a6dcecab 100644 --- a/libhreels/materials.json +++ b/libhreels/materials.json @@ -44,6 +44,33 @@ "reference": "Crandles'99", "name": "SrTiO_3" }, + "Crandles99_2e18_80K": { + "eps": 5.16, + "wTO": [ 50.5 , 174.2 , 548.9 ], + "gTO": [ 16 , 6.0 , 10.0 ], + "wLO": [171.56 , 481.0 , 805.7 ], + "gLO": [ 4.8 , 5.35 , 29.0 ], + "reference": "Crandles'99 2e18 80K", + "name": "SrTiO_3" + }, + "Crandles99_2e18_300K": { + "eps": 5.14, + "wTO": [93.9831, 173.175, 543.346 ], + "gTO": [25.8272, 8.42197, 17.5385 ], + "wLO": [169.788, 474.634, 795.385 ], + "gLO": [ 4.9, 7.07977, 28.3571 ], + "reference": "Crandles'99 2e18 300K", + "name": "SrTiO_3" + }, + "Crandles99_2e19_80K": { + "eps": 5.1, + "wTO": [50.0211, 173.071, 548.723], + "gTO": [34.8738, 5.00001, 10.0], + "wLO": [ 170.94, 493.881, 823.411], + "gLO": [4.69999, 15.3783, 52.6903], + "reference": "Crandles'99 2e19 80K", + "name": "SrTiO_3" + }, "Gervais": { "eps": 5.2, "wTO": [ 88.5533 , 175.999 , 543.0 ], @@ -63,6 +90,15 @@ "reference": "Gervais'93", "comment": "300 K", "name": "SrTiO_3" + }, + "J0B04": { + "eps": 5.2, + "wTO": [60, 171.8, 531.97], + "gTO": [80, 30, 17.706], + "wLO": [170.9, 481, 814.92], + "gLO": [53.6, 13.3 , 36.497], + "reference": "Fit to J0B04", + "name": "SrTiO_3" }, "STO_DEG1": { "eps": 5.14285, diff --git a/libhreels/myBoson.cpython-38-x86_64-linux-gnu.so b/libhreels/myBoson.cpython-38-x86_64-linux-gnu.so new file mode 100644 index 0000000000000000000000000000000000000000..396cb4c6fc7c0d68efaad023959bf20f2e639c2f Binary files /dev/null and b/libhreels/myBoson.cpython-38-x86_64-linux-gnu.so differ diff --git a/libhreels/myEels2.cpython-38-x86_64-linux-gnu.so b/libhreels/myEels2.cpython-38-x86_64-linux-gnu.so new file mode 100644 index 0000000000000000000000000000000000000000..96ad406642fec1e8e08e637e2356b4510a1e3a94 Binary files /dev/null and b/libhreels/myEels2.cpython-38-x86_64-linux-gnu.so differ diff --git a/pyproject.toml b/pyproject.toml index 6ad3a17d3b6026d4c7eeb840f7bcfc5587b632fd..0680ba65c06a2a87834a6e56e27ea8432d458c49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,38 +1,38 @@ -[tool.poetry] -name = "libhreels" -version = "1.0.6" -description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data" -authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"] -include = ["*./libhreels/*"] -exclude = ["./libhreels/eLog*"] -readme = "README.md" -homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" - - -[tool.poetry.dependencies] -python = "^3.6" -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" -PyQt5 = "^5.13" -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.calcHREELS:myMain" -viewhreelstest = "libhreels.ViewHREELS:myMain" - -[tool.poetry.plugins."gui_scripts"] -viewauger = "libhreels.ViewAuger:myMain" -viewhreels = "libhreels.ViewHREELS:myMain" - -[build-system] -requires = ["poetry>=0.12"] +[tool.poetry] +name = "libhreels" +version = "1.0.8" +description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data" +authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"] +include = ["*./libhreels/*"] +exclude = ["./libhreels/eLog*"] +readme = "README.md" +homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" + + +[tool.poetry.dependencies] +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" +PyQt5 = "^5.13" +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.calcHREELS:myMain" +viewhreelstest = "libhreels.ViewHREELS:myMain" + +[tool.poetry.plugins."gui_scripts"] +viewauger = "libhreels.ViewAuger:myMain" +viewhreels = "libhreels.ViewHREELS:myMain" + +[build-system] +requires = ["poetry>=0.12"] build-backend = "poetry.masonry.api" \ No newline at end of file