Version 2.0 (changed fortran code)

libhreels/ViewAuger.py

@@ -11,7 +11,8 @@ from matplotlib.backends.backend_qt5agg import \
     FigureCanvasQTAgg as FigureCanvas
 from matplotlib.backends.backend_qt5agg import \
     NavigationToolbar2QT as NavigationToolbar
-from PyQt5 import QtCore, QtGui, QtWidgets, uic
+#from PyQt5 import QtCore, QtGui, QtWidgets, uic
+from PyQt6 import QtCore, QtGui, QtWidgets, uic
 import libhreels as hh
 hhPath = hh.__path__[0]
 from libhreels.Auger import Auger

libhreels/ViewHREELS.py

@@ -9,7 +9,8 @@ from matplotlib.backends.backend_qt5agg import \
     FigureCanvasQTAgg as FigureCanvas
 from matplotlib.backends.backend_qt5agg import \
     NavigationToolbar2QT as NavigationToolbar
-from PyQt5 import QtCore, QtGui, QtWidgets, uic
+#from PyQt5 import QtCore, QtGui, QtWidgets, uic
+from PyQt6 import QtCore, QtGui, QtWidgets, uic
 import libhreels as hh
 hhPath = os.path.dirname(__file__)
 from libhreels.HREELS import HREELS, myPath

libhreels/myEels3.f90 → libhreels/myEels20.f90

@@ -990,7 +990,7 @@ subroutine seteps(nos, osc_size, osc, epsinf, wn, nLayer, eps)
 
     enddo
     j = j+m     ! we have already looped over the LO modes, therefore increase the index
-    eps(l) = epsinf(l) * nomi / deno + addeps
+    eps(l) = epsinf(l) * (nomi / deno + addeps) ! brackets changed by HHe 230915
   enddo
   debugFirstRun = .false.
   return

pyproject.toml

@@ -17,7 +17,6 @@ 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"}
 
@@ -36,4 +35,4 @@ viewhreels = "libhreels.ViewHREELS20:myMain"
 
 [build-system]
 requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
\ No newline at end of file
+build-backend = "poetry.masonry.api"