Bugfix: Mistakenly thought there was an mpfit2 figure

Author: cdhinrichs

tests/test.py

@@ -4421,7 +4421,7 @@ def testPlots(self):
 
 		self.assertTrue(self.plotDir.exists(), f"Savefig dir {self.plotDir} should exist after analyze() with plot=True")
 
-		expected_plots = WW_FIT_PL_PLOTS + WW_RANDESD_PLOTS + [WW_PLOT_MPFIT2, WW_PLOT_MPDENSITY]
+		expected_plots = WW_FIT_PL_PLOTS + WW_RANDESD_PLOTS + [WW_PLOT_MPDENSITY]
 		self.check_expected_plots(expected_plots)
 
 
@@ -4438,9 +4438,6 @@ def testPlotSingletons(self):
 		self.watcher.analyze(layers=[67], plot=[WW_PLOT_MPFIT], mp_fit=True, savefig=str(self.plotDir))
 		self.check_expected_plots([])
 
-		self.watcher.analyze(layers=[67], plot=[WW_PLOT_MPFIT2], mp_fit=True, savefig=str(self.plotDir))
-		self.check_expected_plots([WW_PLOT_MPFIT2])
-
 		self.watcher.analyze(layers=[67], plot=[WW_PLOT_MPDENSITY], mp_fit=True, savefig=str(self.plotDir))
 		self.check_expected_plots([WW_PLOT_MPDENSITY])
 

weightwatcher/constants.py

@@ -158,7 +158,6 @@
 WW_PLOT_DELTAES_LEVELS  = 'deltaEs_levels'
 
 WW_PLOT_MPFIT           = 'mpfit'
-WW_PLOT_MPFIT2          = 'mpfit2'
 WW_PLOT_MPDENSITY       = 'mpdensity'
 
 WW_PLOT_LOGLOG_ESD      = 'loglog_esd'
@@ -174,7 +173,7 @@
     WW_PLOT_DETX,
     WW_PLOT_VECTOR_METRICS, WW_PLOT_VECTOR_HIST,
     WW_PLOT_LOG_DELTAES, WW_PLOT_DELTAES_LEVELS,
-    WW_PLOT_MPFIT, WW_PLOT_MPFIT2, WW_PLOT_MPDENSITY,
+    WW_PLOT_MPFIT, WW_PLOT_MPDENSITY,
     WW_PLOT_LOGLOG_ESD, WW_PLOT_LINLIN_ESD, WW_PLOT_LOGLIN_ESD, WW_PLOT_DKS, WW_PLOT_XMIN_ALPHA,
     WW_PLOT_RANDESD, WW_PLOT_LOG_RANDESD,
 ]

weightwatcher/weightwatcher.py

@@ -4158,7 +4158,7 @@ def mp_fit(self, evals, N, M, rf, layer_name, layer_id, plot_id, plot, savefig,
         sigma_mp, x, mp = plot_density_and_fit(model=None, eigenvalues=to_plot, layer_name=layer_name, layer_id=0,
                               Q=Q, num_spikes=0, sigma=s1, verbose = False, plot=plot, color=color, cutoff=bulk_max_TW)#, scale=Wscale)
 
-        if WW_PLOT_MPFIT2 in plot:
+        if WW_PLOT_MPDENSITY in plot:
             title = fit_law +" for layer "+layer_name+"\n Q={:0.3} ".format(Q)
             title = title + r"$\sigma_{mp}=$"+"{:0.3} ".format(sigma_mp)
             title = title + r"$\mathcal{R}_{mp}=$"+"{:0.3} ".format(mp_softrank)