PPSD: fix period_lim with xaxis_frequency=True

CHANGELOG.txt

@@ -75,6 +75,7 @@ master:
      (see #2045)
    * Fixed the check for new PSD slices whether they should be added or whether
      they would add unwanted duplicated data (see #2229)
+   * Fix `period_lim` option when `xaxis_frequency=True` (see #2246)
  - obspy.signal.cross_correlation:
    * Add new `correlate_template()` function with 'full' normalization option,
      required for correlations in template-matching

obspy/imaging/tests/test_ppsd.py

@@ -12,7 +12,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from obspy.core.util.testing import ImageComparison
+from obspy.core.util.testing import ImageComparison, MATPLOTLIB_VERSION
 from obspy.signal.tests.test_spectral_estimation import _get_ppsd
 
 
@@ -47,9 +47,15 @@ def test_ppsd_plot_frequency(self):
         """
         Test plot of ppsd example data, normal (non-cumulative) style.
         """
+        # mpl < 2.2 has slightly offset ticks/ticklabels, so needs a higher
+        # tolerance (see e.g. http://tests.obspy.org/102260)
+        reltol = 2
+        if MATPLOTLIB_VERSION < [2, 2]:
+            reltol = 4
         # Catch underflow warnings due to plotting on log-scale.
         with np.errstate(all='ignore'):
-            with ImageComparison(self.path, 'ppsd_freq.png', reltol=2.0) as ic:
+            with ImageComparison(self.path, 'ppsd_freq.png',
+                                 reltol=reltol) as ic:
                 self.ppsd.plot(
                     show=False, show_coverage=False, show_histogram=True,
                     show_percentiles=True, percentiles=[20, 40],

obspy/signal/spectral_estimation.py

@@ -1841,13 +1841,11 @@ def plot(self, filename=None, show_coverage=True, show_histogram=True,
 
         ax.semilogx()
         if xaxis_frequency:
-            xlim = map(lambda x: 1.0 / x, period_lim)
             ax.set_xlabel('Frequency [Hz]')
             ax.invert_xaxis()
         else:
-            xlim = period_lim
             ax.set_xlabel('Period [s]')
-        ax.set_xlim(sorted(xlim))
+        ax.set_xlim(period_lim)
         ax.set_ylim(self.db_bin_edges[0], self.db_bin_edges[-1])
         if self.special_handling is None:
             ax.set_ylabel('Amplitude [$m^2/s^4/Hz$] [dB]')

obspy/signal/tests/test_spectral_estimation.py

@@ -470,11 +470,16 @@ def callback(t_array):
             np.testing.assert_array_equal(selection_got, expected_selection)
 
         # test one particular selection as an image test
+        # mpl < 2.2 has slightly offset ticks/ticklabels, so needs a higher
+        # tolerance (see e.g. http://tests.obspy.org/102260)
+        reltol = 1.5
+        if MATPLOTLIB_VERSION < [2, 2]:
+            reltol = 5
         plot_kwargs = dict(max_percentage=15, xaxis_frequency=True,
                            period_lim=(0.01, 50))
         ppsd.calculate_histogram(**stack_criteria_list[1])
         with ImageComparison(self.path_images,
-                             'ppsd_restricted_stack.png', reltol=1.5) as ic:
+                             'ppsd_restricted_stack.png', reltol=reltol) as ic:
             fig = ppsd.plot(show=False, **plot_kwargs)
             # some matplotlib/Python version combinations lack the left-most
             # tick/label "Jan 2015". Try to circumvent and get the (otherwise
@@ -491,7 +496,7 @@ def callback(t_array):
         #     matches (like above):
         ppsd.calculate_histogram(**stack_criteria_list[1])
         with ImageComparison(self.path_images,
-                             'ppsd_restricted_stack.png', reltol=1.5,
+                             'ppsd_restricted_stack.png', reltol=reltol,
                              plt_close_all_exit=False) as ic:
             fig = ppsd.plot(show=False, **plot_kwargs)
             # some matplotlib/Python version combinations lack the left-most
@@ -527,7 +532,7 @@ def callback(t_array):
         #     image test should pass agin:
         ppsd.calculate_histogram(**stack_criteria_list[1])
         with ImageComparison(self.path_images,
-                             'ppsd_restricted_stack.png', reltol=1.5,
+                             'ppsd_restricted_stack.png', reltol=reltol,
                              plt_close_all_enter=False) as ic:
             ppsd._plot_histogram(fig=fig, draw=True)
             with np.errstate(under='ignore'):