Patch 1.0.2

README.md

@@ -34,15 +34,15 @@ It is recommended to install PyEPR in a virtual environment, from source.
 - xarray
 - h5netcdf
 - toml
-- numba
+- psutil
 
 ## Requirements
 PyEPR is generally compatible with Windows, Mac and Linux and requires Python 3.11 or 3.12. 
 Support for new Python versions will only be added once they become stable, and have been fully tested with PyEPR. This can take some time, so please be patient.
 The specific hardware implementation may add additional limitations for example, when using XeprAPI a modern Linux OS is required.
 
 ## Citing PyEPR
-At the moment, no paper is associated with PyEPR. Once published, it will be linked here. It is kindly requested that in the meantime the appropriate DOI number is cited. The associated Zotero entry is available [here](missing).
+At the moment, no paper is associated with PyEPR. Once published, it will be linked here. It is kindly requested that in the meantime the appropriate DOI number is cited. The associated Zotero entry is available [here](https://doi.org/10.5281/zenodo.17107010).
 
 Citing academic software is important as it helps to ensure the long-term sustainability of the software, and allows the developers to track the impact of their work and secure future funding. It also helps to provide credit to the developers for their hard work.
 

pyepr/hardware/Bruker_AWG.py

@@ -9,10 +9,6 @@
 import time
 from scipy.optimize import minimize_scalar, curve_fit
 import numpy as np
-import threading
-import concurrent.futures
-from PyQt6.QtCore import QThreadPool
-from autodeer.gui import Worker
 import os
 from pathlib import Path
 import datetime
@@ -70,7 +66,7 @@ def __init__(self, config_file:dict) -> None:
         self.bg_data = None
         self.cur_exp = None
         self.tuning = False
-        self.pool = QThreadPool()
+        self.pool = None # QThreadPool
         self.savename = ''
         self.savefolder = str(Path.home())
         self.setup_flag=False
@@ -146,13 +142,6 @@ def _launch_complex_thread(self,sequence,axID=1,tune=True):
         self.terminate()
 
         variables = uProgTable_py['variables']
-        # print("Creating Thread")
-        # # thread = threading.Thread(target=step_parameters,args=[self,reduced_seq,py_ax_dim,variables])
-        # # self.bg_thread = self.pool.submit(step_parameters, self,reduced_seq,py_ax_dim,variables)
-        # self.bg_thread = Worker(step_parameters, self,reduced_seq,py_ax_dim,variables)
-        # self.pool.start(self.bg_thread)
-        # print("Started Thread")
-
         step_parameters(self,reduced_seq,py_ax_dim,variables)
         # thread.start()
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyEPR-ESR"
-version = "1.0.1"
+version = "1.0.2"
 description = ""
 authors = ["Hugo Karas <hkaras@ethz.ch>", "Gunnar Jeschke <gjeschke@eth.ch>", "Stefan Stoll <stst@uw.edu>"]
 readme = "README.md"
@@ -19,6 +19,7 @@ h5netcdf = "^1.4.0"
 toml = "^0.10.2"
 deerlab = "^1.1.4"
 numba = ">=0.60.0"
+psutil = "^7.1.3"
 
 
 [tool.poetry.group.dev.dependencies]