Merge pull request #41 from magsreed/master

find_optimum_bias plot bug

Author: magsreed

pytesdaq/processing/_iv_didv_tools.py

@@ -632,7 +632,7 @@ def _fit_rn_didv(self, lgcplot=False, lgcsave=False, **kwargs):
                     saveplot=lgcsave,
                     savepath=self.figsavepath,
                     savename=f'didv_{didvn.qetbias:.3e}',
-                )
+                )    
         self.rn_didv = np.mean(rtot_list) - self.rload
         self.rtot_list = rtot_list
         self.dt0_n = np.median(dt0_list)
@@ -1226,6 +1226,7 @@ def model_noise_simple(self, tau_collect=20e-6, collection_eff=1,
                     xlims=xlims,
                     ylims=ylims_power,
                 )
+                plt.show()
 
 
             res = energy_res_estimate(
@@ -1654,6 +1655,22 @@ def find_optimum_bias(self, lgcplot=False, lgcsave=False, xlims=None,
 
         if lgcplot:
             plot._plot_energy_res_vs_bias(
+                self,
+                r0s,
+                energy_res,
+                energy_res_err,
+                qets,
+                taus,
+                xlims,
+                ylims,
+                lgcoptimum=lgcoptimum,
+                lgctau=lgctau,
+                energyscale=energyscale,
+            )
+            plt.show()
+        if lgcsave:
+            plot._plot_energy_res_vs_bias(
+                self,
                 r0s,
                 energy_res,
                 energy_res_err,
@@ -1664,6 +1681,7 @@ def find_optimum_bias(self, lgcplot=False, lgcsave=False, xlims=None,
                 lgcoptimum=lgcoptimum,
                 lgctau=lgctau,
                 energyscale=energyscale,
+                lgcsave = lgcsave
             )
         if lgctau:
             return (

pytesdaq/processing/_iv_didv_tools_plotting.py

@@ -174,7 +174,7 @@ def _plot_rload_rn_qetbias(IVanalysisOBJ, lgcsave, xlims_rl, ylims_rl,
         plt.savefig(IVanalysisOBJ.figsavepath + 'rload_rtot_variation.png')
 
 
-def _plot_energy_res_vs_bias(r0s, energy_res, energy_res_err, qets, taus,
+def _plot_energy_res_vs_bias(IVanalysisOBJ, r0s, energy_res, energy_res_err, qets, taus,
                              xlims=None, ylims=None, lgctau=False,
                              lgcoptimum=False, figsavepath='', lgcsave=False,
                              energyscale=None):
@@ -184,6 +184,9 @@ def _plot_energy_res_vs_bias(r0s, energy_res, energy_res_err, qets, taus,
 
     Parameters
     ----------
+    IVanalysisOBJ : rqpy.IVanalysis
+        The IV analysis object that contains the data to use for
+        plotting.
     r0s : ndarray
         Array of r0 values (in Ohms).
     energy_res : ndarray
@@ -319,7 +322,8 @@ def _plot_energy_res_vs_bias(r0s, energy_res, energy_res_err, qets, taus,
             ax.legend(loc='upper center', handles=[plte, plttau])
 
     if lgcsave:
-        plt.savefig(f'{figsavepath}energy_res_vs_bias.png')
+        plt.savefig(IVanalysisOBJ.figsavepath + 'energy_res_vs_bias.png')
+        
 
 def _plot_didv_bias(data, xlims=(-.15,0.025), ylims=(0,.08), cmap='magma'):
     """