lime-stable 2.0.dev6__tar.gz → 2.0.dev7__tar.gz

{lime_stable-2.0.dev6/src/lime_stable.egg-info → lime_stable-2.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lime-stable
-Version: 2.0.dev6
+Version: 2.0.dev7
 Summary: Line measuring algorithm for astronomical spectra
 Author-email: Vital Fernández <vgf@umich.edu>
 License-Expression: GPL-3.0-or-later

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lime-stable"
-version = "2.0.dev6"
+version = "2.0.dev7"
 readme = "README.rst"
 requires-python = ">=3.11"
 license = "GPL-3.0-or-later"

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7}/src/lime/lime.toml

@@ -1,3 +1,3 @@
 [metadata]
 name = 'lime-stable'
-version = "2.0.dev6"
+version = "2.0.dev7"

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7}/src/lime/plotting/bokeh_plots.py

@@ -117,16 +117,25 @@ def bands_filling_bokeh(fig, x, y, z_corr, idcs_mask, label, exclude_continua=Fa
         low_lim = 0 if np.isnan(low_lim) else low_lim
 
         # Central bands
+        print('1',x[idcs_mask[2]:idcs_mask[3]]/z_corr)
+        print('1',y[idcs_mask[2]:idcs_mask[3]]*z_corr)
+        print('1',low_lim*z_corr)
         fig.varea_step(x=x[idcs_mask[2]:idcs_mask[3]]/z_corr, y1=low_lim*z_corr, y2=y[idcs_mask[2]:idcs_mask[3]]*z_corr,
                         step_mode="center", fill_alpha=0.25, color=color_dict['line_band'])
 
         # Continua bands exclusion
         if exclude_continua is False:
+            print('2', x[idcs_mask[0]:idcs_mask[1]]/z_corr)
+            print('2', low_lim*z_corr)
+            print('2', y[idcs_mask[0]:idcs_mask[1]]*z_corr)
             fig.varea_step(x=x[idcs_mask[0]:idcs_mask[1]]/z_corr,
                            y1=low_lim*z_corr,
                            y2=y[idcs_mask[0]:idcs_mask[1]]*z_corr,
                            step_mode="center", fill_alpha=0.25, color=color_dict['cont_band'])
 
+            print('3', x[idcs_mask[4]:idcs_mask[5]]/z_corr)
+            print('3', low_lim*z_corr)
+            print('3', y[idcs_mask[4]:idcs_mask[5]]*z_corr)
             fig.varea_step(x=x[idcs_mask[4]:idcs_mask[5]]/z_corr,
                            y1=low_lim*z_corr,
                            y2=y[idcs_mask[4]:idcs_mask[5]]*z_corr,
@@ -186,7 +195,7 @@ class BokehFigures:
 
         return
 
-    def bands(self, label, output_address=None, ref_bands=None, include_fits=True, rest_frame=False, log_scale=True,
+    def bands(self, label, output_address=None, bands=None, include_fits=True, rest_frame=False, log_scale=True,
               exclude_continua=True, fig_cfg=None, ax_cfg=None, return_fig=False):
 
 
@@ -198,7 +207,7 @@ class BokehFigures:
         legend_check = True if label is not None else False
 
         # Check which line should be plotted
-        line = parse_bands_arguments(label, log, ref_bands, norm_flux)
+        line = parse_bands_arguments(label, log, bands, norm_flux)
 
         # Proceed to plot
         if line is not None:

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7}/src/lime/plotting/plots.py

@@ -1269,8 +1269,8 @@ class SpectrumFigures(Plotter):
 
         return in_fig
 
-    def bands(self, label=None, output_address=None, ref_bands=None, include_fits=True, rest_frame=False, y_scale='auto', fig_cfg=None,
-              ax_cfg=None, in_fig=None, maximize=False, show_err=False):
+    def bands(self, label=None, bands=None, output_address=None, include_fits=True, rest_frame=False, y_scale='auto', fig_cfg=None,
+              ax_cfg=None, in_fig=None, maximize=False, show_err=False, exclude_continua=False):
 
         """
 
@@ -1327,7 +1327,7 @@ class SpectrumFigures(Plotter):
         display_check = True if in_fig is None else False
 
         # Check which line should be plotted
-        line = parse_bands_arguments(label, log, ref_bands, norm_flux)
+        line = parse_bands_arguments(label, bands, log, norm_flux)
 
         # Check the observation has uncertainty to display
         if show_err and (self._spec.err_flux is None):
@@ -1372,13 +1372,13 @@ class SpectrumFigures(Plotter):
                 idcs_bands = line.index_bands(self._spec.wave, self._spec.redshift, just_band_edges=True)
 
                 # Plot the spectrum
-                label_leg = line.latex_label if (line.latex_label is not None and include_fits is False) else None
+                label_leg = line.latex_label[0] if (line.latex_label[0] is not None and include_fits is False) else None
                 in_ax[0].step(wave_plot[idcs_bands[0]:idcs_bands[5]] / z_corr, flux_plot[idcs_bands[0]:idcs_bands[5]] * z_corr,
                               where='mid', color=theme.colors['fg'], label=label_leg, linewidth=theme.plt['spectrum_width'])
 
                 # Continuum bands
                 bands_filling_plot(in_ax[0], wave_plot, flux_plot, z_corr, idcs_bands, line, color_dict=theme.colors,
-                                   show_central=not show_err)
+                                   show_central=not show_err, exclude_continua=exclude_continua)
 
                 if show_err:
                     err_plot = self._spec.err_flux.data

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7}/src/lime/plotting/utils.py

@@ -7,21 +7,21 @@ from lime.io import _PARENT_BANDS
 _logger = logging.getLogger('LiMe')
 
 
-def parse_bands_arguments(label, log, ref_bands, norm_flux):
+def parse_bands_arguments(label, bands, log, norm_flux):
 
     line = None
     if label is None and (log.index.size > 0):
         label = log.index[-1]
         line = Line.from_log(label, log, norm_flux)
 
+    # The user provided a reference band to check the region use it
+    elif label is not None and bands is not None:
+        line = Line(label, bands)
+
     # Line has been measured before
     elif label is not None and (log.index.size > 0):
         line = Line.from_log(label, log, norm_flux)
 
-    # The user provided a reference band to check the region use it
-    elif label is not None and ref_bands is not None:
-        line = Line(label, ref_bands)
-
     elif label is not None and label in _PARENT_BANDS.index:
         line = Line(label, band=_PARENT_BANDS.loc[label, 'w1':'w6'].to_numpy())
 

{lime_stable-2.0.dev6 → lime_stable-2.0.dev7/src/lime_stable.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lime-stable
-Version: 2.0.dev6
+Version: 2.0.dev7
 Summary: Line measuring algorithm for astronomical spectra
 Author-email: Vital Fernández <vgf@umich.edu>
 License-Expression: GPL-3.0-or-later