Bug fixes.

Updated user guide.

Author: 4-DMAPandSadness

Controller.py

@@ -376,7 +376,7 @@ def plotCustom(self, wave, time, v_min, v_max, model, cont, custom, mul,
     def plotSolo(self, wave, time, v_min, v_max, model, cont, solo, mul,
                    add=""):
         """
-        Allows for the creation of 1-3 subplots in one plot.
+        Allows for the creation of single plots.
 
         Parameters
         ----------
@@ -594,6 +594,8 @@ def saveResults(self, model, tau_start, tau_fit, l_limits, d_limits, A_fit,
         None.
 
         """
+        for i,n in enumerate(tau_fit):
+            tau_fit[i] = round(n,2)
         time_unit = self.labels[1].split("/")[1]
         x_axis_unit = self.labels[0].split("/")[1]
         if model == 0:

EfsTA.py

@@ -136,25 +136,7 @@ def setText(self, model, Controller):
         """
         self.ui.textResults.clear()
         text = Controller.getResults(model)
-        self.ui.textResults.append(text)    
- 
-    def closePopupMatrix(self,popup):
-        """
-        Transfers the custom matrix input by the user from the popup object to
-        the main window and closes the popup window.
-
-        Parameters
-        ----------
-        popup : TableWindow
-            The TableWindow object created by the main window.
-
-        Returns
-        -------
-        None.
-
-        """
-        self.custom_matrix = popup.custom_matrix
-        popup.close()
+        self.ui.textResults.append(text)
 
 #####################################MAIN######################################
 
@@ -921,6 +903,24 @@ def checkIfCustomMatrixEmpty(self):
             self.openFailSafe("Please input a kinetic matrix.")
             return True
 
+    def closePopupMatrix(self,popup):
+        """
+        Transfers the custom matrix input by the user from the popup object to
+        the main window and closes the popup window.
+
+        Parameters
+        ----------
+        popup : TableWindow
+            The TableWindow object created by the main window.
+
+        Returns
+        -------
+        None.
+
+        """
+        self.custom_matrix = popup.custom_matrix
+        popup.close()
+
 #####################################PREPARE PARAMETERS########################
 
     def summonRadio(self,layout_origin):
@@ -1120,15 +1120,19 @@ def rawPlotting(self):
         if hasattr(self, "Controller") == False:
             self.openFailSafe("Please select a directory first.")
         else:
-            ds = sorted(self.getDelaySlices())
-            ws = sorted(self.getWavelengthSlices())
-            db = [self.getLowerDelayBound(), self.getUpperDelayBound()]
-            wb = [self.getLowerWavelengthBound(), self.getUpperWavelengthBound()]
-            self.Controller.createOrigData(db,wb, None, None)
-            self.ui.plot_concentrations.setChecked(False)
-            self.ui.plot_das_sas.setChecked(False)
-            self.ui.plot_residuals.setChecked(False)
-            self.plotting(ds, ws, 0, True)
+            if hasattr(self.Controller, "delays_filename") == False:
+                self.openFailSafe("Please select a valid directory first.")
+            else:
+                self.getAxis()
+                ds = sorted(self.getDelaySlices())
+                ws = sorted(self.getWavelengthSlices())
+                db = [self.getLowerDelayBound(), self.getUpperDelayBound()]
+                wb = [self.getLowerWavelengthBound(), self.getUpperWavelengthBound()]
+                self.Controller.createOrigData(db,wb, None, None)
+                self.ui.plot_concentrations.setChecked(False)
+                self.ui.plot_das_sas.setChecked(False)
+                self.ui.plot_residuals.setChecked(False)
+                self.plotting(ds, ws, 0, True)
 
     def plotting(self,ds,ws,model,raw):
         """
@@ -1199,7 +1203,7 @@ def checkIfMethodSelected(self):
            self.ui.GTA_radio_preset_model.isChecked() == False and 
            self.ui.GTA_radio_custom_model.isChecked() == False and 
            self.ui.GTA_radio_custom_matrix.isChecked() == False):
-            self.openFailSafe("Please select an evaluation method.")
+            self.openFailSafe("Please select an analysis method.")
             return False
 
     def finalCheck(self):
@@ -1655,4 +1659,4 @@ def clearPickle(self):
     EfsTA.setStyle('Fusion')
     mainwindow = MainWindow()
     mainwindow.show()
-    sys.exit(EfsTA.exec_())
+    sys.exit(EfsTA.exec_())

Model.py

@@ -1,7 +1,6 @@
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import matplotlib.colors as col
-from matplotlib.ticker import LogLocator
 import matplotlib.ticker as mticker
 import os
 import numpy as np
@@ -711,11 +710,11 @@ def plot1(self, grid, wave, wave_index, spectra, mul, labels):
         ax1.set_xlabel(labels[2] + dot)
         ax1.set_ylabel(labels[1])
 
-        for ind in wave_index:
+        for i, ind in enumerate(wave_index):
             ax1.plot(
                 spectra[ind],
                 self.delays,
-                label=str(self.lambdas[ind]) + unit
+                label=str(wave[i]) + unit
             )
         ax1.axvline(0, color="black",lw = 0.5 , alpha=0.75)
         temp = np.concatenate([spectra[i]
@@ -847,15 +846,15 @@ def plot3(self, grid, time, time_index, spectra, mul, labels):
         y = np.zeros(len(self.lambdas))
         hoehe = 0
         temp = np.zeros(len(self.lambdas))
-        for i in time_index:
+        for i, ind in enumerate(time_index):
             for j in range(len(self.lambdas)):
-                temp[j] = spectra[j][i]
+                temp[j] = spectra[j][ind]
                 y[j] = temp[j] + hoehe
-            if i == time_index[0]:
+            if ind == time_index[0]:
                 mini = min(y)
             ax3.plot(self.lambdas, y, color="black")
             ax3.annotate(
-                str(self.delays[i]) + unit, (0.5 * (min(self.lambdas) +
+                str(time[i]) + unit, (0.5 * (min(self.lambdas) +
                                  max(self.lambdas)), hoehe)
             )
             ax3.axhline(hoehe, color="black", lw = 0.5, alpha = 0.75)
@@ -1009,7 +1008,7 @@ def plotCustom(self, spectra, wave, time, v_min, v_max, custom, cont, mul, label
             if w3 == 0:
                 cb.set_label(labels[2] + dot)
             if w2 == 4.7:
-                ax2.yaxis.set_major_locator(LogLocator())
+                ax2.yaxis.set_major_locator(mticker.LogLocator())
                 ax2.set_ylabel(labels[1])
         if w3 != 0:
             self.plot3(grid, time, time_index, spectra*mul, mul, labels)
@@ -1200,7 +1199,7 @@ def plotHeat(self, wave, time, v_min, v_max, spectra, cont, mul, labels, add):
         ax.set_yscale("log")
         ax.set_xlabel(labels[0])
         ax.set_ylabel(labels[1])
-        A_t = spectra.T
+        A_t = spectra.T*mul
         pcm = ax.pcolormesh(
             self.lambdas,
             self.delays,

README.md

@@ -26,6 +26,6 @@
 
 NumPy, SciPy, asteval, uncertainties, lmfit, PyQt, matplotlib
 
+## **Known Problems**
 
-
-
+On rare occasions the program randomly segfaults. After starting the program again usually everything is just fine