better fit plot
This commit is contained in:
parent
def7d58217
commit
2666875379
|
|
@ -3,14 +3,6 @@
|
|||
import numpy as np
|
||||
from scipy.optimize import curve_fit
|
||||
|
||||
from PyQt6.QtWidgets import (
|
||||
QVBoxLayout, QGridLayout, QWidget, QCheckBox
|
||||
)
|
||||
|
||||
import matplotlib.pyplot as plt
|
||||
from matplotlib.backends.backend_qtagg import NavigationToolbar2QT as NavigationToolbar
|
||||
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
|
||||
|
||||
from ExtractXsecPy import read_DWBA
|
||||
from PlotWindow import FitPlotWindow
|
||||
|
||||
|
|
@ -88,7 +80,7 @@ class Fitting():
|
|||
print("=========== Number of data set:", len(self.dataName_list))
|
||||
for i in range(0, len(self.dataName_list)):
|
||||
print("-------------------------")
|
||||
print(" ExList:", self.dataName_list[i])
|
||||
print(" data Name:", self.dataName_list[i])
|
||||
print("Fit Options:", self.fitOption[i])
|
||||
print(" Data List:\n", self.expData[i])
|
||||
|
||||
|
|
@ -160,6 +152,12 @@ class Fitting():
|
|||
for k , dN in enumerate(self.dataName_list):
|
||||
self.FitSingleData(k)
|
||||
self.plot.append( FitPlotWindow(f"Data-{k}"))
|
||||
self.plot[-1].set_data(k, self.expData, self.fitOption, dN, self.dataX, self.data, self.para, self.para_err, self.chi_squared)
|
||||
self.plot[-1].set_data(k, self.expData, self.fitOption, dN,
|
||||
self.dataX, self.data, self.headers,
|
||||
self.para, self.para_err, self.chi_squared)
|
||||
self.plot[-1].plot_Fit()
|
||||
self.plot[-1].show()
|
||||
|
||||
def close_plots(self):
|
||||
for plot in self.plot:
|
||||
plot.close()
|
||||
|
|
|
|||
|
|
@ -29,6 +29,10 @@ class FitPlotWindow(QWidget):
|
|||
self.gridline_checkbox = QCheckBox("Show Gridlines")
|
||||
self.gridline_checkbox.stateChanged.connect(self.plot_Fit)
|
||||
|
||||
self.legend_checkbox = QCheckBox("Show Legends")
|
||||
self.legend_checkbox.setChecked(True)
|
||||
self.legend_checkbox.stateChanged.connect(self.plot_Fit)
|
||||
|
||||
self.figure, self.ax = plt.subplots()
|
||||
self.canvas = FigureCanvas(self.figure)
|
||||
self.toolbar = NavigationToolbar(self.canvas, self)
|
||||
|
|
@ -37,25 +41,32 @@ class FitPlotWindow(QWidget):
|
|||
layout.addWidget(self.toolbar, 0, 0, 1, 3)
|
||||
layout.addWidget(self.log_scale_checkbox, 1, 0)
|
||||
layout.addWidget(self.gridline_checkbox, 1, 1)
|
||||
layout.addWidget(self.legend_checkbox, 1, 2)
|
||||
layout.addWidget(self.canvas, 2, 0, 5, 3)
|
||||
|
||||
self.setLayout(layout)
|
||||
|
||||
def set_data(self, ID, expData, fitOption, dataName_list, xData, yData_list, para, perr, chi_square ):
|
||||
def set_data(self, ID, expData, fitOption, dataName_list, xData, yData_list, headers, para, perr, chi_square ):
|
||||
self.x_exp = expData[ID][:, 0]
|
||||
self.x_err = expData[ID][:, 1]
|
||||
self.y_exp = expData[ID][:, 2]
|
||||
self.y_err = expData[ID][:, 3]
|
||||
self.dataName = dataName_list[ID]
|
||||
self.dataName = dataName_list
|
||||
self.fitOption = fitOption[ID]
|
||||
|
||||
self.xData = xData
|
||||
self.yData_list = yData_list
|
||||
|
||||
self.para = para
|
||||
self.perr = perr
|
||||
self.chi_square = chi_square
|
||||
|
||||
self.xData = xData
|
||||
self.yData_list = yData_list
|
||||
|
||||
self.headers = headers
|
||||
|
||||
print(self.dataName)
|
||||
print(self.fitOption)
|
||||
print(self.headers)
|
||||
|
||||
def plot_Fit(self):
|
||||
self.ax.clear()
|
||||
|
||||
|
|
@ -66,6 +77,9 @@ class FitPlotWindow(QWidget):
|
|||
fitTheory_lower = []
|
||||
fitTheory_upper = []
|
||||
|
||||
fitXsecID = []
|
||||
fitHeaders = []
|
||||
|
||||
for k in range(len(self.fitOption)):
|
||||
|
||||
xsecIDStr = self.fitOption[k].strip()
|
||||
|
|
@ -75,25 +89,37 @@ class FitPlotWindow(QWidget):
|
|||
fitTheory_upper.append(np.zeros_like(self.xData))
|
||||
fitTheory_lower.append(np.zeros_like(self.xData))
|
||||
|
||||
for id in xsecID:
|
||||
fitTheory[k] += self.para[k] * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
fitTheory_upper[k] += (self.para[k] + self.perr[k]) * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
fitTheory_lower[k] += (self.para[k] - self.perr[k]) * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
for i, id in enumerate(xsecID):
|
||||
fitXsecID.append(id)
|
||||
fitHeaders.append(self.headers[id])
|
||||
fitTheory[k] += self.para[k][i] * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
fitTheory_upper[k] += (self.para[k][i] + self.perr[k][i]) * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
fitTheory_lower[k] += (self.para[k][i] - self.perr[k][i]) * np.interp(self.xData, self.xData, self.yData_list[id])
|
||||
|
||||
|
||||
for i, fit in enumerate(fitTheory):
|
||||
self.ax.plot(self.xData, fit, label=f'Chi2:{self.chi_square[i]:.3f} | Xsec:{self.fitOption[i]}')
|
||||
self.ax.fill_between(self.xData, fitTheory_lower[i], fitTheory_upper[i], alpha=0.2)
|
||||
|
||||
self.ax.text(0.05, 0.1 + 0.05*i, f"Xsec-{self.fitOption[i].strip()}: {', '.join([f'{x:.3f}' for x in self.para[i]])} +/- {', '.join([f'{x:.3f}' for x in self.perr[i]])}" ,
|
||||
transform=plt.gca().transAxes, fontsize=12,
|
||||
verticalalignment='bottom', horizontalalignment='left', color=self.default_colors[i])
|
||||
if self.legend_checkbox.isChecked() :
|
||||
self.ax.text(0.98, 0.98 - 0.05*i, rf"Fit-{self.fitOption[i].strip()}: {', '.join([f'{x:.3f}' for x in self.para[i]])} +/- {', '.join([f'{x:.3f}' for x in self.perr[i]])} | $\chi^2$ {self.chi_square[i]:.3f}" ,
|
||||
transform=plt.gca().transAxes, fontsize=12, fontfamily='monospace',
|
||||
verticalalignment='top', horizontalalignment='right', color=self.default_colors[i])
|
||||
|
||||
# Replace plt.title() with plt.text() to position the title inside the plot
|
||||
self.ax.text(0.05, 0.05, f'Fit for Exp Data : {self.dataName}', transform=plt.gca().transAxes,
|
||||
self.ax.text(0.02, 0.05, f'Exp Data : {self.dataName}', transform=plt.gca().transAxes,
|
||||
fontsize=12, verticalalignment='bottom', horizontalalignment='left', color='black')
|
||||
|
||||
|
||||
if self.legend_checkbox.isChecked() :
|
||||
fitXsecID = list(dict.fromkeys(fitXsecID))
|
||||
fitHeaders = list(dict.fromkeys(fitHeaders))
|
||||
|
||||
for i , header in enumerate(fitHeaders):
|
||||
self.ax.text(0.02, 0.10 + 0.05*i, f'Fit-{fitXsecID[i]} : {header}', transform=plt.gca().transAxes,
|
||||
fontsize=12, verticalalignment='bottom', horizontalalignment='left', color='grey')
|
||||
|
||||
|
||||
# Plot decorator
|
||||
# Apply log scale for y-axis if selected
|
||||
if self.log_scale_checkbox.isChecked():
|
||||
|
|
@ -110,7 +136,7 @@ class FitPlotWindow(QWidget):
|
|||
|
||||
self.ax.set_xlabel(r'$\theta_{cm}$ [deg]')
|
||||
self.ax.set_ylabel(r'd$\sigma$/d$\Omega$ [deg]')
|
||||
self.ax.legend(loc='upper right', frameon=True)
|
||||
# self.ax.legend(loc='upper right', frameon=True)
|
||||
|
||||
self.ax.autoscale(enable=True, axis='x', tight=True)
|
||||
self.figure.subplots_adjust(left=0.1, right=0.95, top=0.95, bottom=0.1)
|
||||
|
|
|
|||
|
|
@ -410,6 +410,8 @@ class MyWindow(QMainWindow):
|
|||
if self.Ex_window:
|
||||
self.Ex_window.close() # Close the PlotWindow when MainWindow closes
|
||||
self.Ex_window.__del__()
|
||||
|
||||
self.fitting.close_plots()
|
||||
print("============== Bye Bye ========== ")
|
||||
event.accept() # Accept the event to proceed with closing the main window
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user