IPKM/nmreval
13
2
Fork 1
Code Issues 36 Pull Requests Actions Packages Projects Releases Wiki Activity

dev #297

Merged
dominik merged 40 commits from dev into master 2024-11-14 17:20:32 +00:00
Conversation 0 Commits 40 Files Changed 9 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac6b734f81 - Show all commits

3
src/gui_qt/main/mainwindow.py
View File

@ -677,8 +677,9 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
from ..math.skipping import QSkipDialog from ..math.skipping import QSkipDialog
dial = QSkipDialog(self) dial = QSkipDialog(self)
dial.exec() res = dial.exec()
if res:
self.management.skip_points(**dial.get_arguments()) self.management.skip_points(**dial.get_arguments())
@QtCore.pyqtSlot(name='on_action_coup_calc_triggered') @QtCore.pyqtSlot(name='on_action_coup_calc_triggered')

4
src/nmreval/distributions/energy.py
View File

@ -95,7 +95,7 @@ def _integrate_c(func, omega: np.ndarray, temperature: np.ndarray, tau0: float,
for o, t in product(omega, temperature): for o, t in product(omega, temperature):
c = (c_double * 5)(o, tau0, e_m, e_b, t) c = (c_double * 5)(o, tau0, e_m, e_b, t)
user_data = cast(pointer(c), c_void_p) user_data = cast(pointer(c), c_void_p)
area = quad(LowLevelCallable(func, user_data), 0, np.infty, epsabs=1e-13)[0] area = quad(LowLevelCallable(func, user_data), 0, np.inf, epsabs=1e-13)[0]
res.append(area) res.append(area)
@ -111,7 +111,7 @@ def _integrate_py(func, axis, temp, tau0, e_m, e_b):
e_axis = np.linspace(max(0., e_m - 50*e_b), e_m + 50*e_b, num=5001) e_axis = np.linspace(max(0., e_m - 50*e_b), e_m + 50*e_b, num=5001)
ret_val = [] ret_val = []
for o, tt in product(x, temperature): for o, tt in product(x, temperature):
ret_val.append(simpson(func(e_axis, o, tau0, e_m, e_b, tt), e_axis)) ret_val.append(simpson(y=func(e_axis, o, tau0, e_m, e_b, tt), x=e_axis))
ret_val = np.array(ret_val).reshape(x.shape[0], temperature.shape[0]) ret_val = np.array(ret_val).reshape(x.shape[0], temperature.shape[0])