wlref now considered while fitting

Author: SarthakJariwala

PythonGUI_apps/Spectrum_analysis/Spectra_fit_funcs.py

@@ -23,16 +23,21 @@ class Spectra_Fit(object):
         ref: reference spectrum (both x and y-axis) for background correction
     """
 
-    def __init__(self, data, ref):
+    def __init__(self, data, ref, wlref = None):
         self.data = data
         self.ref = ref
+        self.wlref = wlref
 
     def background_correction(self):
         """Return the background corrected spectrum"""
         x = self.data[:, 0] # wavelengths
         y = self.data[:, 1] # intensity
         yref = self.ref[:, 1]
         y = y - yref # background correction
+        if self.wlref is not None:
+            wlref = self.wlref[:,1]
+            y = y/wlref
+            
         # y = y - np.mean(y[(x>600) & (x<700)]) # removing any remaining bckgrnd
         return [x,y]
 

PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit.py

@@ -134,19 +134,22 @@ def fit_and_plot(self):
 
         if self.ui.subtract_bck_checkBox.isChecked() == False:
             self.ui.result_textBrowser.setText("You need to check the subtract background option!")
+        
+        elif self.wlref_file != None and self.ui.WLRef_checkBox.isChecked() == False:
+            self.ui.result_textBrowser.setText("You need to check the White Light Correction option!")
 
         else:
             if fit_func == "Single Gaussian" and self.ui.subtract_bck_checkBox.isChecked() == True:
 
-                single_gauss = Single_Gaussian(self.file, self.bck_file)
+                single_gauss = Single_Gaussian(self.file, self.bck_file, wlref=self.wlref_file)
                 self.result = single_gauss.gaussian_model()
                 self.ui.plot.plot(self.x, self.y, clear=True, pen='r')
                 self.ui.plot.plot(self.x, self.result.best_fit, clear=False, pen='k')
                 self.ui.result_textBrowser.setText(self.result.fit_report())
 
             elif fit_func == "Single Lorentzian" and self.ui.subtract_bck_checkBox.isChecked() == True:
 
-                single_lorentzian = Single_Lorentzian(self.file, self.bck_file)
+                single_lorentzian = Single_Lorentzian(self.file, self.bck_file, wlref=self.wlref_file)
                 self.result = single_lorentzian.lorentzian_model()
                 self.ui.plot.plot(self.x, self.y, clear=True, pen='r')
                 self.ui.plot.plot(self.x, self.result.best_fit, clear=False, pen='k')