avg lifetime in double exponential assigned to greater of the taus and added to srv calculation

Author: SarthakJariwala

PythonGUI_apps/Lifetime_analysis/Lifetime_plot_fit.py

@@ -432,6 +432,10 @@ def fit_and_plot_with_irf(self):
                         "\ntau2 = %.5f ns"
                         "\nnoise = %.5f counts" %(bestfit_params[0], bestfit_params[1], bestfit_params[2], bestfit_params[3], bestfit_params[4]))
                     #TODO - once tau_avg implemented, set average lifetime spinbox to tau_avg value
+                    if bestfit_params[3] > bestfit_params[1]:
+                        self.ui.average_lifetime_spinBox.setValue(bestfit_params[3])
+                    elif bestfit_params[1] > bestfit_params[3]:
+                        self.ui.average_lifetime_spinBox.setValue(bestfit_params[1])
 
                 elif fit_func == "Single Exponential": #single exponential tab
                     a_bounds = (self.ui.se_a_min_spinBox.value(), self.ui.se_a_max_spinBox.value())