improved warnings, MulensData._get_name() added

rpoleski · Jun 16, 2023 · 84c5ea1 · 84c5ea1
1 parent 7bcac6c
commit 84c5ea1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/source/MulensModel/mulensdata.py b/source/MulensModel/mulensdata.py
@@ -157,10 +157,7 @@ def __init__(self, data_list=None, file_name=None,
         self._ephemerides_file = ephemerides_file
 
     def __repr__(self):
-        if 'label' in self.plot_properties:
-            name = self.plot_properties['label']
-        else:
-            name = self._file_name
+        name = self._get_name()
 
         out = "{:25} n_epochs ={:>5}, n_bad ={:>5}".format(
             name+":", self.n_epochs, np.sum(self.bad))
@@ -185,6 +182,15 @@ def __repr__(self):
 
         return out
 
+    def _get_name(self):
+        """extract the name of dataset"""
+        if 'label' in self.plot_properties:
+            name = self.plot_properties['label']
+        else:
+            name = self._file_name
+
+        return name
+
     def _import_photometry(self, data_list, **kwargs):
         """import time, brightness, and its uncertainty"""
         # Import the photometry...
@@ -444,14 +450,16 @@ def _plot_datapoints(
 
         if show_errorbars:
             if np.any(y_err[self.good] < 0.):
-                warnings.warn("Cannot plot errorbars with negative values.")
+                warnings.warn("Cannot plot errorbars with negative values. "
+                              "Skipping dataset: " + self._get_name())
                 return
             container = self._plt_errorbar(time_good, y_good,
                                            y_err[self.good], properties)
             if show_bad:
                 if np.any(y_err[self.bad] < 0.):
-                    warnings.warn("Cannot plot errorbars with negative "
-                                  "values (bad data).")
+                    warnings.warn(
+                        "Cannot plot errorbars with negative values (bad "
+                        "data). Skipping dataset: " + self._get_name())
                     return
                 if not ('color' in properties_bad or 'c' in properties_bad):
                     properties_bad['color'] = container[0].get_color()

diff --git a/source/MulensModel/version.py b/source/MulensModel/version.py
@@ -1 +1 @@
-__version__ = "2.16.5"
+__version__ = "2.16.6"