Module restructuring

pyproject.toml

@@ -30,6 +30,7 @@ classifiers = [
 ]
 
 dependencies = [
+    "h5py>=3.0.0",
     "lmfit>=1.0.3",
     "matplotlib>=3.8.0",
     "numpy>=1.26.1,<2.0",

src/mpes_tools/__init__.py

@@ -1,7 +1,9 @@
 """mpes-tools module easy access APIs."""
 import importlib.metadata
 
-from .Arpes_gui import MainWindow
+from mpes_tools.guis.gui_4D import MpesTool4D
+from mpes_tools.guis.gui_3D import MpesTool3D
+from mpes_tools.guis.gui_fitting import MpesToolFitting
 
 __version__ = importlib.metadata.version("mpes-tools")
-__all__ = ["MainWindow"]
+__all__ = ["MpesTool4D", "MpesTool3D", "MpesToolFitting"]

src/mpes_tools/additional_window.py → src/mpes_tools/guis/gui_3D.py

@@ -6,13 +6,14 @@
 from matplotlib.patches import Circle
 from matplotlib.lines import Line2D
 
-from mpes_tools.fi_panel6 import MainWindow
+from mpes_tools.guis.gui_fitting import MpesToolFitting
 
 import xarray as xr
 
-# %matplotlib qt
+import matplotlib
+matplotlib.use('qtagg')
 
-class GraphWindow(QMainWindow):
+class MpesTool3D(QMainWindow):
     def __init__(self,data_array: xr.DataArray,t,dt):
         global t_final
         super().__init__()
@@ -172,7 +173,7 @@ def plot_graph(self,t,dt):
 
     def fit_panel(self,event):
         print('forfit',len(self.plot),'axis',len(self.axis))
-        graph_window=   MainWindow( self.data_o, self.axis,self.square_coords[0][1], self.square_coords[1][1],self.t,self.dt)
+        graph_window=   MpesToolFitting( self.data_o, self.axis,self.square_coords[0][1], self.square_coords[1][1],self.t,self.dt)
         graph_window.show()
         self.graph_windows.append(graph_window)
 

src/mpes_tools/Arpes_gui.py → src/mpes_tools/guis/gui_4D.py

@@ -3,14 +3,14 @@
 from PyQt5.QtCore import Qt
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 import matplotlib.pyplot as plt
-import numpy as np
-import h5py
-from mpes_tools.additional_window import GraphWindow
+from mpes_tools.guis.gui_3D import MpesTool3D
 import xarray as xr
-from mpes_tools.hdf5 import load_h5
+from mpes_tools.io.hdf5 import load_h5
 
+import matplotlib
+matplotlib.use('qtagg')
 
-class MainWindow(QMainWindow):
+class MpesTool4D(QMainWindow):
     def __init__(self):
         super().__init__()
 
@@ -159,7 +159,7 @@ def open_graph_kxkydt(self):
         E1=self.data_array[self.axes[2]][self.slider1[0].value()].item()
         E2=self.data_array[self.axes[2]][self.slider1[0].value()+self.slider2[0].value()+1].item()
         data_kxkydt = self.data_array.loc[{self.axes[2]:slice(E1,E2)}].mean(dim=(self.axes[2]))
-        graph_window=GraphWindow(data_kxkydt, self.slider3[0].value(), self.slider4[0].value())
+        graph_window=MpesTool3D(data_kxkydt, self.slider3[0].value(), self.slider4[0].value())
         # Show the graph window
         graph_window.show()
         self.graph_windows.append(graph_window)
@@ -168,7 +168,7 @@ def open_graph_kxedt(self):
         ky1=self.data_array[self.axes[1]][self.slider1[1].value()].item()
         ky2=self.data_array[self.axes[1]][self.slider1[1].value()+self.slider2[1].value()+1].item()
         data_kxedt = self.data_array.loc[{self.axes[1]:slice(ky1,ky2)}].mean(dim=(self.axes[1]))
-        graph_window = GraphWindow(data_kxedt, self.slider3[1].value(), self.slider4[1].value())
+        graph_window = MpesTool3D(data_kxedt, self.slider3[1].value(), self.slider4[1].value())
         # Show the graph window
         graph_window.show()
         self.graph_windows.append(graph_window)
@@ -177,7 +177,7 @@ def open_graph_kyedt(self):
         kx1=self.data_array[self.axes[0]][self.slider1[2].value()].item()
         kx2=self.data_array[self.axes[0]][self.slider1[2].value()+self.slider2[2].value()+1].item()
         data_kyedt = self.data_array.loc[{self.axes[0]:slice(kx1,kx2)}].mean(dim=(self.axes[0]))
-        graph_window = GraphWindow(data_kyedt, self.slider3[2].value(), self.slider4[2].value())
+        graph_window = MpesTool3D(data_kyedt, self.slider3[2].value(), self.slider4[2].value())
         # Show the graph window
         graph_window.show()
         self.graph_windows.append(graph_window)
@@ -299,6 +299,6 @@ def slider_changed(self, value):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-    window = MainWindow()
+    window = MpesTool4D()
     window.show()
     sys.exit(app.exec_())

src/mpes_tools/fi_panel6.py → src/mpes_tools/guis/gui_fitting.py

@@ -8,13 +8,15 @@
 import numpy as np
 from lmfit import CompositeModel, Model
 import inspect
-from .movable_vertical_cursors_graph import MovableCursors
-from .make_model import make_model
-from .graphs2 import showgraphs
+from mpes_tools.tools.movable_vertical_cursors_graph import MovableCursors
+from mpes_tools.tools.make_model import make_model
+from mpes_tools.guis.graphs2 import showgraphs
 
+import matplotlib
+matplotlib.use('qtagg')
 
 
-class MainWindow(QMainWindow):
+class MpesToolFitting(QMainWindow):
     def __init__(self,data,axis,c1,c2,t,dt):
         super().__init__()
 
@@ -692,6 +694,6 @@ def zero(x):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-    window = MainWindow()
+    window = MpesToolFitting()
     window.show()
     sys.exit(app.exec_())