xarpes 0.3.4__tar.gz → 0.4.0__tar.gz

{xarpes-0.3.4 → xarpes-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xarpes
-Version: 0.3.4
+Version: 0.4.0
 Summary: Extraction from angle resolved photoemission spectra
 Author: xARPES Developers
 Requires-Python: >=3.7.0
@@ -88,10 +88,10 @@ Example for Linux:
 
 Answer `y` to questions. Create and activate a new environment:
 
-    conda create -n <my_env> -c defaults -c conda-forge  
+    conda create -n <my_env> -c conda-forge  
     conda activate <my_env>
 
-Where `<my_env>` must be replaced by your desired name.
+Where `<my_env>` must be replaced by your desired name. Package compatibility ssues may arise if conda installs from different channels. This can be prevented by appending `--strict-channel-priority` to the creation command.
 
 ### Installing xARPES
 

{xarpes-0.3.4 → xarpes-0.4.0}/README.md

@@ -65,10 +65,10 @@ Example for Linux:
 
 Answer `y` to questions. Create and activate a new environment:
 
-    conda create -n <my_env> -c defaults -c conda-forge  
+    conda create -n <my_env> -c conda-forge  
     conda activate <my_env>
 
-Where `<my_env>` must be replaced by your desired name.
+Where `<my_env>` must be replaced by your desired name. Package compatibility ssues may arise if conda installs from different channels. This can be prevented by appending `--strict-channel-priority` to the creation command.
 
 ### Installing xARPES
 

{xarpes-0.3.4 → xarpes-0.4.0}/examples/graphene/graphene.Rmd

@@ -8,7 +8,7 @@ jupyter:
       format_version: '1.2'
       jupytext_version: 1.15.2
   kernelspec:
-    display_name: 3.7_env
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
 ---
@@ -30,9 +30,6 @@ import os
 
 # Default plot configuration from xarpes.plotting.py
 xarpes.plot_settings('default')
-
-# If needed, close figures before running other cells, if figures show up in the wrong places.
-# get_ipython().events.register('pre_run_cell', lambda info: plt.close('all'))
 ```
 
 ```{python}
@@ -63,13 +60,13 @@ fig = bmap.plot(abscissa='momentum', ordinate='kinetic_energy', ax=ax)
 
 fig, ax = plt.subplots(2, 1, figsize=(6, 8))
 
-fig = bmap.correct_fermi_edge(
+bmap.correct_fermi_edge(
       hnuminphi_guess=32, background_guess=1e2,
       integrated_weight_guess=1e3, angle_min=-10, angle_max=10,
       ekin_min=31.96, ekin_max=32.1, true_angle=0,
       ax=ax[0], show=False, fig_close=False)
 
-fig = bmap.plot(ordinate='electron_energy', abscissa='momentum',
+bmap.plot(ordinate='electron_energy', abscissa='momentum',
       ax=ax[1], show=False, fig_close=False)
 
 # Figure customization
@@ -125,6 +122,7 @@ fig = mdcs.visualize_guess(distributions=guess_dists, energy_value=energy_value,
 #### Note on interactive figures
 - The interactive figure might not work inside the Jupyter notebooks, despite our best efforts to ensure stability.
 - As a fallback, the user may switch from "%matplotlib widget" to "%matplotlib qt", after which the figure should pop up in an external window.
+- For some package versions, a static version of the interactive widget may spuriously show up inside other cells. In that case, uncomment the #get_ipython()... line in the first cell for your notebooks.
 
 ```{python}
 # %matplotlib widget
@@ -137,53 +135,29 @@ mdcs = xarpes.MDCs(*bmap.mdc_set(angle_min, angle_max, energy_range=energy_range
 fig = mdcs.fit_selection(distributions=guess_dists, ax=ax)
 ```
 
-```{python}
-# # %matplotlib widget
-
-# fig = plt.figure(figsize=(7, 5))
-# ax = fig.gca()
-
-# mdcs.plot(energy_range=[-0.15, -0.05], ax=ax)
-```
-
 ```{python}
 # %matplotlib inline
 
-self_energy = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Linear_test_1',
-                                fermi_velocity=2.85, fermi_wavevector=0.358))
-```
-
-```{python}
-# %matplotlib inline
+plt.rcParams['lines.markersize'] = 0.8
 
 fig = plt.figure(figsize=(8, 5))
 ax = fig.gca()
 
-from xarpes.constants import stdv
+self_energy = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Linear_test_1',
+                                fermi_velocity=2.85, fermi_wavevector=0.358))
 
-ax.errorbar(self_energy.peak_positions, self_energy.enel_range, 
-            xerr=stdv * self_energy.peak_positions_sigma,
-           markersize=2, color='tab:blue', label=self_energy.label)
+self_energies = xarpes.CreateSelfEnergies([self_energy])
 
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
+fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax,
+                self_energies=self_energies)
 ```
 
 ```{python}
 # %matplotlib inline
 
-fig = plt.figure(figsize=(7, 5))
-ax = fig.gca()
-
-from xarpes.constants import stdv
-
-ax.errorbar(self_energy.enel_range, self_energy.imag, 
-            yerr=stdv * self_energy.imag_sigma, label =r"$-\Sigma''(E)$")
-ax.errorbar(self_energy.enel_range, self_energy.real,
-            yerr=stdv * self_energy.real_sigma, label =r"$\Sigma'(E)$")
-ax.set_xlabel(r'$E-\mu$ (eV)'); ax.set_ylabel(r"$\Sigma'(E), -\Sigma''(E)$ (eV)")
+fig = plt.figure(figsize=(7, 5)); ax = fig.gca()
 
-plt.legend()
-plt.show()
+fig = self_energy.plot_real(ax=ax)
 ```
 
 ```{python}
@@ -192,6 +166,8 @@ plt.show()
 angle_min2 = -1e6
 angle_max2 = 0
 
+plt.rcParams['lines.markersize'] = 3.0
+
 mdc2 = xarpes.MDCs(*bmap.mdc_set(angle_min2, angle_max2, energy_range=energy_range))
 
 guess_dists2 = xarpes.CreateDistributions([
@@ -215,70 +191,50 @@ fermi_velocity=-2.67, fermi_wavevector=-0.354))
 ```
 
 ```{python}
-import numpy as np
-
-from xarpes.constants import dtor, pref
-
-Angl, Ekin = np.meshgrid(bmap.angles, bmap.ekin)
-Mome = np.sqrt(Ekin / pref) * np.sin(Angl * dtor)
-
-kmin, kmax = np.min(Mome), np.max(Mome)
-
-kspc = np.linspace(kmin, kmax, len(bmap.angles))
-
-dis1 = self_energy.fermi_velocity * (kspc - self_energy.fermi_wavevector)
-
-dis2 = self_left.fermi_velocity *(kspc - self_left.fermi_wavevector)
-```
-
-```{python}
-# ax.set_xlim([np.min(Mome), np.max(Mome)])
-# ax.set_ylim([np.min(Ekin - bmap.hnuminphi), np.max(Ekin - bmap.hnuminphi)])
-
-from importlib import reload
-import xarpes
-reload(xarpes)
-
 # %matplotlib inline
 
-fig = plt.figure(figsize=(8, 5))
-ax = fig.gca()
+fig = plt.figure(figsize=(8, 5)); ax = fig.gca()
 
 self_energies= xarpes.CreateSelfEnergies([
-    self_energy, 
-    self_left
-    ])
+    self_energy, self_left])
 
 fig = bmap.plot(abscissa='momentum', ordinate='electron_energy',
-                self_energies=self_energies,  ax=ax, markersize=1.0)
+                self_energies=self_energies, plot_dispersions='full',
+                ax=ax)
 ```
 
 ```{python}
 # %matplotlib inline
+fig = plt.figure(figsize=(9, 6)); ax = fig.gca()
 
-fig = plt.figure(figsize=(8, 5))
-ax = fig.gca()
+self_left.plot_both(ax=ax, show=False, fig_close=False)
+self_energy.plot_both(ax=ax, show=False, fig_close=False)
 
-from xarpes.constants import stdv
+ax.set_xlim([-0.275, 0.025])
+ax.set_ylim([-0.025, 0.275])
 
-ax.errorbar(self_left.mdc_maxima, self_left.enel_range, 
-            xerr=stdv * self_left.peak_positions_sigma,
-           markersize=2, color='tab:red', label=self_left.label)
+plt.legend(); plt.show()
+```
 
-ax.errorbar(self_energy.mdc_maxima, self_energy.enel_range, 
-            xerr=stdv * self_energy.peak_positions_sigma,
-           markersize=2, color='tab:blue', label=self_energy.label)
+```{python}
+# %matplotlib inline
+fig = plt.figure(figsize=(8, 6)); ax = fig.gca()
 
-ax.plot(kspc, dis1, linestyle='--'); ax.plot(kspc, dis2, linestyle='--')
+self_left.plot_both(ax=ax, show=False, fig_close=False)
+self_energy.plot_both(ax=ax, show=False, fig_close=False)
 
-ax.set_xlim([np.min(Mome), np.max(Mome)])
-ax.set_ylim([np.min(Ekin - bmap.hnuminphi), np.max(Ekin - bmap.hnuminphi)])
+ax.set_xlim([-0.275, 0.025]); ax.set_ylim([-0.025, 0.275])
 
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
-```
+# Replace labels with custom labels
+left_real, left_imag, right_real, right_imag = ax.get_lines()
 
-```{python}
+labels = [
+    r"$\Sigma_{\mathrm{L}}'(E)$", r"$-\Sigma_{\mathrm{L}}''(E)$",
+    r"$\Sigma_{\mathrm{R}}'(E)$", r"$-\Sigma_{\mathrm{R}}''(E)$",
+]
 
+ax.legend([left_real, left_imag, right_real, right_imag], labels)
+plt.show()
 ```
 
 ```{python}

{xarpes-0.3.4 → xarpes-0.4.0}/examples/graphene/graphene.py

@@ -17,8 +17,6 @@ import os
 # Default plot configuration from xarpes.plotting.py
 xarpes.plot_settings('default')
 
-# If needed, close figures before running other cells, if figures show up in the wrong places.
-
 script_dir = xarpes.set_script_dir()
 
 dfld = 'data_sets'    # Folder containing the data
@@ -40,13 +38,13 @@ fig = bmap.plot(abscissa='momentum', ordinate='kinetic_energy', ax=ax)
 
 fig, ax = plt.subplots(2, 1, figsize=(6, 8))
 
-fig = bmap.correct_fermi_edge(
+bmap.correct_fermi_edge(
       hnuminphi_guess=32, background_guess=1e2,
       integrated_weight_guess=1e3, angle_min=-10, angle_max=10,
       ekin_min=31.96, ekin_max=32.1, true_angle=0,
       ax=ax[0], show=False, fig_close=False)
 
-fig = bmap.plot(ordinate='electron_energy', abscissa='momentum',
+bmap.plot(ordinate='electron_energy', abscissa='momentum',
       ax=ax[1], show=False, fig_close=False)
 
 # Figure customization
@@ -95,6 +93,7 @@ fig = mdcs.visualize_guess(distributions=guess_dists, energy_value=energy_value,
 # #### Note on interactive figures
 # - The interactive figure might not work inside the Jupyter notebooks, despite our best efforts to ensure stability.
 # - As a fallback, the user may switch from "%matplotlib widget" to "%matplotlib qt", after which the figure should pop up in an external window.
+# - For some package versions, a static version of the interactive widget may spuriously show up inside other cells. In that case, uncomment the #get_ipython()... line in the first cell for your notebooks.
 
 
 fig = plt.figure(figsize=(7, 5))
@@ -105,46 +104,30 @@ mdcs = xarpes.MDCs(*bmap.mdc_set(angle_min, angle_max, energy_range=energy_range
 fig = mdcs.fit_selection(distributions=guess_dists, ax=ax)
 
 
-# fig = plt.figure(figsize=(7, 5))
-# ax = fig.gca()
-
-# mdcs.plot(energy_range=[-0.15, -0.05], ax=ax)
-
-
-self_energy = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Linear_test_1',
-                                fermi_velocity=2.85, fermi_wavevector=0.358))
-
+plt.rcParams['lines.markersize'] = 0.8
 
 fig = plt.figure(figsize=(8, 5))
 ax = fig.gca()
 
-from xarpes.constants import stdv
-
-ax.errorbar(self_energy.peak_positions, self_energy.enel_range, 
-            xerr=stdv * self_energy.peak_positions_sigma,
-           markersize=2, color='tab:blue', label=self_energy.label)
-
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
+self_energy = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Linear_test_1',
+                                fermi_velocity=2.85, fermi_wavevector=0.358))
 
+self_energies = xarpes.CreateSelfEnergies([self_energy])
 
-fig = plt.figure(figsize=(7, 5))
-ax = fig.gca()
+fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax,
+                self_energies=self_energies)
 
-from xarpes.constants import stdv
 
-ax.errorbar(self_energy.enel_range, self_energy.imag, 
-            yerr=stdv * self_energy.imag_sigma, label =r"$-\Sigma''(E)$")
-ax.errorbar(self_energy.enel_range, self_energy.real,
-            yerr=stdv * self_energy.real_sigma, label =r"$\Sigma'(E)$")
-ax.set_xlabel(r'$E-\mu$ (eV)'); ax.set_ylabel(r"$\Sigma'(E), -\Sigma''(E)$ (eV)")
+fig = plt.figure(figsize=(7, 5)); ax = fig.gca()
 
-plt.legend()
-plt.show()
+fig = self_energy.plot_real(ax=ax)
 
 
 angle_min2 = -1e6
 angle_max2 = 0
 
+plt.rcParams['lines.markersize'] = 3.0
+
 mdc2 = xarpes.MDCs(*bmap.mdc_set(angle_min2, angle_max2, energy_range=energy_range))
 
 guess_dists2 = xarpes.CreateDistributions([
@@ -164,62 +147,43 @@ fig = mdc2.fit_selection(distributions=guess_dists2, show=False, fig_close=True)
 self_left = xarpes.SelfEnergy(*mdc2.expose_parameters(select_label='Linear_left_1',
 fermi_velocity=-2.67, fermi_wavevector=-0.354))
 
-import numpy as np
 
-from xarpes.constants import dtor, pref
-
-Angl, Ekin = np.meshgrid(bmap.angles, bmap.ekin)
-Mome = np.sqrt(Ekin / pref) * np.sin(Angl * dtor)
-
-kmin, kmax = np.min(Mome), np.max(Mome)
-
-kspc = np.linspace(kmin, kmax, len(bmap.angles))
-
-dis1 = self_energy.fermi_velocity * (kspc - self_energy.fermi_wavevector)
-
-dis2 = self_left.fermi_velocity *(kspc - self_left.fermi_wavevector)
-
-# ax.set_xlim([np.min(Mome), np.max(Mome)])
-# ax.set_ylim([np.min(Ekin - bmap.hnuminphi), np.max(Ekin - bmap.hnuminphi)])
-
-from importlib import reload
-import xarpes
-reload(xarpes)
-
-
-fig = plt.figure(figsize=(8, 5))
-ax = fig.gca()
+fig = plt.figure(figsize=(8, 5)); ax = fig.gca()
 
 self_energies= xarpes.CreateSelfEnergies([
-    self_energy, 
-    self_left
-    ])
+    self_energy, self_left])
 
 fig = bmap.plot(abscissa='momentum', ordinate='electron_energy',
-                self_energies=self_energies,  ax=ax, markersize=1.0)
+                self_energies=self_energies, plot_dispersions='full',
+                ax=ax)
 
+fig = plt.figure(figsize=(9, 6)); ax = fig.gca()
 
-fig = plt.figure(figsize=(8, 5))
-ax = fig.gca()
+self_left.plot_both(ax=ax, show=False, fig_close=False)
+self_energy.plot_both(ax=ax, show=False, fig_close=False)
 
-from xarpes.constants import stdv
+ax.set_xlim([-0.275, 0.025])
+ax.set_ylim([-0.025, 0.275])
 
-ax.errorbar(self_left.mdc_maxima, self_left.enel_range, 
-            xerr=stdv * self_left.peak_positions_sigma,
-           markersize=2, color='tab:red', label=self_left.label)
+plt.legend(); plt.show()
 
-ax.errorbar(self_energy.mdc_maxima, self_energy.enel_range, 
-            xerr=stdv * self_energy.peak_positions_sigma,
-           markersize=2, color='tab:blue', label=self_energy.label)
+fig = plt.figure(figsize=(8, 6)); ax = fig.gca()
 
-ax.plot(kspc, dis1, linestyle='--'); ax.plot(kspc, dis2, linestyle='--')
+self_left.plot_both(ax=ax, show=False, fig_close=False)
+self_energy.plot_both(ax=ax, show=False, fig_close=False)
 
-ax.set_xlim([np.min(Mome), np.max(Mome)])
-ax.set_ylim([np.min(Ekin - bmap.hnuminphi), np.max(Ekin - bmap.hnuminphi)])
+ax.set_xlim([-0.275, 0.025]); ax.set_ylim([-0.025, 0.275])
 
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
+# Replace labels with custom labels
+left_real, left_imag, right_real, right_imag = ax.get_lines()
 
+labels = [
+    r"$\Sigma_{\mathrm{L}}'(E)$", r"$-\Sigma_{\mathrm{L}}''(E)$",
+    r"$\Sigma_{\mathrm{R}}'(E)$", r"$-\Sigma_{\mathrm{R}}''(E)$",
+]
 
+ax.legend([left_real, left_imag, right_real, right_imag], labels)
+plt.show()
 
 
 # fig = plt.figure(figsize=(8, 5))

{xarpes-0.3.4 → xarpes-0.4.0}/examples/srtio3/srtio3.Rmd

@@ -7,7 +7,7 @@ jupyter:
       format_version: '1.2'
       jupytext_version: 1.15.2
   kernelspec:
-    display_name: 3.7_env
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
 ---
@@ -27,9 +27,6 @@ import os
 
 # Default plot configuration from xarpes.plotting.py
 xarpes.plot_settings('default')
-
-# If needed, close figures before running other cells, if figures show up in the wrong places.
-# get_ipython().events.register('pre_run_cell', lambda info: plt.close('all'))
 ```
 
 ```{python}
@@ -104,18 +101,15 @@ fig = mdcs.visualize_guess(distributions=guess_dists, matrix_element=mat_el,
 #### Note on interactive figures
 - The interactive figure might not work inside the Jupyter notebooks, despite our best efforts to ensure stability.
 - As a fallback, the user may switch from "%matplotlib widget" to "%matplotlib qt", after which the figure should pop up in an external window.
+- For some package versions, a static version of the interactive widget may spuriously show up inside other cells. In that case, uncomment the #get_ipython()... line in the first cell for your notebooks.
 
 ```{python}
 # %matplotlib widget
 
-fig = plt.figure(figsize=(7, 5))
-ax = fig.gca()
+fig = plt.figure(figsize=(7, 5)); ax = fig.gca()
 
 fig = mdcs.fit_selection(distributions=guess_dists, matrix_element=mat_el, 
                          matrix_args=mat_args, ax=ax)
-
-# fig = mdcs.fit_selection(distributions=guess_dists, matrix_element=mat_el, 
-#                          matrix_args=mat_args, ax=ax)
 ```
 
 ##### Notes for quadratic bands
@@ -125,10 +119,8 @@ fig = mdcs.fit_selection(distributions=guess_dists, matrix_element=mat_el,
 - Instead, the user is advised to carefully check correspondence of peak maxima with MDC fitting results.
 
 ```{python}
-fermi_one = 0.142
-
 self_energy = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Inner_band_1', 
-                                bare_mass=0.6, fermi_wavevector=fermi_one, side='right'))
+                                bare_mass=0.6, fermi_wavevector=0.142, side='right'))
 
 self_two = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Outer_band_2',
                                 bare_mass=0.6, fermi_wavevector=0.207))
@@ -136,80 +128,27 @@ self_two = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Outer_band_2'
 self_two.side='right'
 ```
 
-```{python}
-self_energies = xarpes.CreateSelfEnergies([self_energy, self_two])
-```
-
 ```{python}
 # %matplotlib inline
 
-fig = plt.figure(figsize=(8, 5))
-ax = fig.gca()
-
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', self_energies=self_energies, ax=ax)
-```
-
-```{python}
-fig = plt.figure(figsize=(7, 5))
-ax = fig.gca()
-
-from xarpes.constants import stdv
-
-ax.errorbar(self_energy.enel_range, self_energy.imag,
-            yerr=stdv * self_energy.imag_sigma, label =r"$-\Sigma''_{\rm{IR}}(E)$")
-ax.errorbar(self_energy.enel_range, self_two.imag,
-            yerr=stdv * self_two.imag_sigma, label =r"$-\Sigma''_{\rm{OR}}(E)$")
-ax.errorbar(self_energy.enel_range, self_energy.real,
-            yerr=stdv * self_energy.real_sigma, label =r"$\Sigma'_{\rm{IR}}(E)$")
-ax.errorbar(self_energy.enel_range, self_two.real,
-            yerr=stdv * self_two.real_sigma, label =r"$\Sigma'_{\rm{OR}}(E)$")
-ax.set_xlabel(r'$E-\mu$ (eV)'); ax.set_ylabel(r"$\Sigma'(E), -\Sigma''(E)$ (eV)")
-
-ax.set_ylim([0, 0.06])
-
-plt.legend(); plt.show()
-```
-
-```{python}
-import numpy as np
-
-Angl, Ekin = np.meshgrid(bmap.angles, bmap.ekin)
-Mome = np.sqrt(Ekin / xarpes.pref) * np.sin(Angl * xarpes.dtor)
-
-kmin, kmax = np.min(Mome), np.max(Mome)
-
-kspc = np.linspace(kmin, kmax, len(bmap.angles))
-
-dis1 = xarpes.pref * (((kspc - self_energy.center_wavevector)**2 - self_energy.fermi_wavevector**2)) \
-    / self_energy.bare_mass
+self_energies = xarpes.CreateSelfEnergies([self_energy, self_two])
 
-# dis1 = self_energy.fermi_velocity * (kspc - self_energy.fermi_wavevector)
+fig = plt.figure(figsize=(8, 5)); ax = fig.gca()
 
-# dis2 = self_left.fermi_velocity *(kspc - self_left.fermi_wavevector)
+fig = bmap.plot(abscissa='momentum', ordinate='kinetic_energy', 
+                plot_dispersions='domain', 
+                self_energies=self_energies, ax=ax)
 ```
 
 ```{python}
 # %matplotlib inline
 
-fig = plt.figure(figsize=(10, 7))
-ax = fig.gca()
+fig = plt.figure(figsize=(9, 6)); ax = fig.gca()
 
-self_energies = xarpes.CreateSelfEnergies([self_energy, self_two])
+self_energy.plot_both(ax=ax, show=False, fig_close=False)
+self_two.plot_both(ax=ax, show=False, fig_close=False)
 
-# ax.errorbar(self_energy.mdc_maxima, self_energy.enel_range, 
-#             xerr=stdv * self_energy.peak_positions_sigma,
-#            markersize=2, color='tab:blue', label=self_energy.label)
-# ax.errorbar(self_two.mdc_maxima, self_two.enel_range, 
-#             xerr=stdv * self_two.peak_positions_sigma,
-#            markersize=2, color='tab:purple', label=self_two.label)
-
-ax.plot(kspc, dis1, linestyle='--')
-
-ax.set_xlim([-0.25, 0.25]); ax.set_ylim([-0.3, 0.1])
-
-plt.legend()
-
-fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
+plt.legend(); plt.show()
 ```
 
 ```{python}
@@ -248,41 +187,28 @@ fig = mdcs.fit_selection(distributions=guess_dists, ax=ax)
 
 ```{python}
 self_three = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Inner_nm_1', side='right',
-                                fermi_wavevector=10))
+                                bare_mass=0.5, fermi_wavevector=0.142))
 
 self_four = xarpes.SelfEnergy(*mdcs.expose_parameters(select_label='Outer_nm_2', side='right',
-                                fermi_wavevector=10))
+                                bare_mass=0.62, fermi_wavevector=0.207))
+
+self_three.side='left'
+self_four.side='left'
 ```
 
 ```{python}
 # %matplotlib inline
 
-fig = plt.figure(figsize=(10, 7))
+fig = plt.figure(figsize=(12, 6))
 ax = fig.gca()
 
-from xarpes.constants import stdv
-
-ax.errorbar(self_energy.mdc_maxima, self_energy.enel_range, 
-            xerr=stdv * self_energy.peak_positions_sigma,
-           markersize=2, color='tab:blue', label=self_energy.label)
-ax.errorbar(self_two.mdc_maxima, self_two.enel_range, 
-            xerr=stdv * self_two.peak_positions_sigma,
-           markersize=2, color='tab:purple', label=self_two.label)
-ax.errorbar(self_three.mdc_maxima, self_three.enel_range, 
-            xerr=stdv * self_three.peak_positions_sigma,
-            markersize=2, color='tab:brown', label=self_three.label)
-ax.errorbar(self_four.mdc_maxima, self_four.enel_range, 
-            xerr=stdv * self_four.peak_positions_sigma, 
-            markersize=2, color='palevioletred', label=self_four.label)
-
-ax.set_xlim([0, 0.25]); ax.set_ylim([-0.15, 0.05])
-
-plt.legend()
-
-
-bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax)
+self_total = xarpes.CreateSelfEnergies([
+    self_energy, self_two,
+    self_three, self_four
+])
 
-plt.show()
+fig = bmap.plot(abscissa='momentum', ordinate='electron_energy', ax=ax, self_energies=self_total,
+          plot_dispersions='domain')
 ```
 
 ```{python}