Skip to content

Commit dec4e35

Browse files
committed
BrukerAWG Dependency Fix
1 parent fb007c2 commit dec4e35

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ It is recommended to install PyEPR in a virtual environment, from source.
3434
- xarray
3535
- h5netcdf
3636
- toml
37-
- numba
37+
- psutil
3838

3939
## Requirements
4040
PyEPR is generally compatible with Windows, Mac and Linux and requires Python 3.11 or 3.12.

pyepr/hardware/Bruker_AWG.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
import time
1010
from scipy.optimize import minimize_scalar, curve_fit
1111
import numpy as np
12-
import threading
13-
import concurrent.futures
14-
from PyQt6.QtCore import QThreadPool
15-
from autodeer.gui import Worker
1612
import os
1713
from pathlib import Path
1814
import datetime
@@ -70,7 +66,7 @@ def __init__(self, config_file:dict) -> None:
7066
self.bg_data = None
7167
self.cur_exp = None
7268
self.tuning = False
73-
self.pool = QThreadPool()
69+
self.pool = None # QThreadPool
7470
self.savename = ''
7571
self.savefolder = str(Path.home())
7672
self.setup_flag=False
@@ -146,13 +142,6 @@ def _launch_complex_thread(self,sequence,axID=1,tune=True):
146142
self.terminate()
147143

148144
variables = uProgTable_py['variables']
149-
# print("Creating Thread")
150-
# # thread = threading.Thread(target=step_parameters,args=[self,reduced_seq,py_ax_dim,variables])
151-
# # self.bg_thread = self.pool.submit(step_parameters, self,reduced_seq,py_ax_dim,variables)
152-
# self.bg_thread = Worker(step_parameters, self,reduced_seq,py_ax_dim,variables)
153-
# self.pool.start(self.bg_thread)
154-
# print("Started Thread")
155-
156145
step_parameters(self,reduced_seq,py_ax_dim,variables)
157146
# thread.start()
158147

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "pyEPR-ESR"
3-
version = "1.0.1"
3+
version = "1.0.2"
44
description = ""
55
authors = ["Hugo Karas <hkaras@ethz.ch>", "Gunnar Jeschke <gjeschke@eth.ch>", "Stefan Stoll <stst@uw.edu>"]
66
readme = "README.md"
@@ -19,6 +19,7 @@ h5netcdf = "^1.4.0"
1919
toml = "^0.10.2"
2020
deerlab = "^1.1.4"
2121
numba = ">=0.60.0"
22+
psutil = "^7.1.3"
2223

2324

2425
[tool.poetry.group.dev.dependencies]

0 commit comments

Comments
 (0)