diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-29 09:30:47 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-29 09:30:47 +0100 |
| commit | 0c0f828c6bccee3aeb3049cb8b5bb480153cd3b6 (patch) | |
| tree | 520dc4ff15dbc8dba056ea03d762d570b243f27d /dpd/src/MER.py | |
| parent | 9234155749be0c9ee3ae1269f47c2240d302c21a (diff) | |
| parent | 8e3338479c180418a05ab030c60ba01c2a8615ca (diff) | |
| download | dabmod-0c0f828c6bccee3aeb3049cb8b5bb480153cd3b6.tar.gz dabmod-0c0f828c6bccee3aeb3049cb8b5bb480153cd3b6.tar.bz2 dabmod-0c0f828c6bccee3aeb3049cb8b5bb480153cd3b6.zip | |
Merge branch 'next' into outputRefactoring
Diffstat (limited to 'dpd/src/MER.py')
| -rw-r--r-- | dpd/src/MER.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dpd/src/MER.py b/dpd/src/MER.py index f186261..693058d 100644 --- a/dpd/src/MER.py +++ b/dpd/src/MER.py @@ -8,11 +8,6 @@ import datetime import os import logging -try: - logging_path = os.path.dirname(logging.getLoggerClass().root.handlers[0].baseFilename) -except: - logging_path = "/tmp/" - import numpy as np import matplotlib matplotlib.use('agg') @@ -76,9 +71,11 @@ class MER: spectrum = self._calc_spectrum(tx) - if self.plot: + if self.plot and self.c.plot_location is not None: dt = datetime.datetime.now().isoformat() - fig_path = logging_path + "/" + dt + "_MER" + debug_name + ".svg" + fig_path = self.c.plot_location + "/" + dt + "_MER" + debug_name + ".png" + else: + fig_path = None MERs = [] for i, (x, y) in enumerate(self._split_in_carrier( @@ -103,7 +100,7 @@ class MER: ylim = ax.get_ylim() ax.set_ylim(ylim[0] - (ylim[1] - ylim[0]) * 0.1, ylim[1]) - if self.plot: + if fig_path is not None: plt.tight_layout() plt.savefig(fig_path) plt.show() |