Gwpy workarounds

bin/gwdv

@@ -67,6 +67,11 @@ if args.no_latex:
 
 mon = from_ini(args.configuration)
 mon.logger.setLevel(args.verbose)
+try:  # todo: put all the logger of all the monitors to the level?
+    mon.buffer.logger.setLevel(args.verbose)
+    mon.spectrograms.logger.setLevel(args.verbose)
+except AttributeError:
+    pass
 try:
     if args.back_fill:
         mon.backfill()

dataviewer/__init__.py

@@ -19,8 +19,6 @@
 """GWDV: The gravitational-wave data viewer
 """
 
-import nds2
-
 from . import version
 
 __author__ = 'Duncan Macleod <[email protected]>'

dataviewer/config.py

@@ -136,7 +136,6 @@ def from_ini(filepath, ifo=None):
     basics = dict(cp.items('monitor', raw=True))
     type_ = basics.pop('type')
     channels = map(str, ChannelList.from_names(basics.pop('channels', '')))
-    references = basics.pop('references', None)
     combinations = basics.pop('combinations', None)
     basics = dict((key, safe_eval(val)) for (key, val) in basics.iteritems())
     # get type
@@ -149,9 +148,9 @@ def from_ini(filepath, ifo=None):
     if not channels:
         channels = [c for c in sections if c not in ['monitor', 'plot']
                     if c[:4] not in ['ref:', 'com:']]
-    if references is None:
-        references = [c for c in sections if c not in ['monitor', 'plot']
-                      if c[:4] == 'ref:']
+
+    references = [c for c in sections if c not in ['monitor', 'plot']
+                  if c[:4] == 'ref:']
     if combinations is None:
         combinations = [c for c in sections if c not in ['monitor', 'plot']
                         if c[:4] == 'com:']
@@ -171,49 +170,46 @@ def from_ini(filepath, ifo=None):
             val = safe_eval(val)
             if param not in cparams:
                 cparams[param] = []
-            while len(cparams[param]) < i:
+            while len(cparams[param]) < len(channels):
                 cparams[param].append(None)
-            cparams[param].append(val)
+            cparams[param][i] = val
+
 
     # get reference parameters
+    # reference parameters will be sent to the monitor in a dictionary
+    #  with the path of each reference as keys and with the name and the other
+    # parameters as a dictionary for each key
+
     rparams = OrderedDict()
     for reference in references:
-        if os.path.basename(reference[4:]) == '':
-            # Section is a directory:
-            # get parameters (will be applied to all refrences)
-            _params = cp.items(reference)
-            rparamsi = OrderedDict()
-            for param, val in _params:
-                val = safe_eval(val)
-                if param == 'format':
-                    refform = val
-                else:
-                    rparamsi[param] = val
-            # import all references in folder (assumes 'dat' format)
-            refdir = reference[4:]
-            for f in os.listdir(refdir):
-                if os.path.splitext(f)[1] in ['.txt', '.dat', '.gz']:
-                    refspec = Spectrum.read(refdir + f)
-                    refspec.name = f.split('.')[0].replace('_', r' ')
-                    rparams[refspec] = rparamsi
-        else:
-            # get rerference section
-            _params = cp.items(reference)
-            refpath = reference[4:]
-            refform = 'txt'
-            deflabel = os.path.basename(refpath).split('.')[0]
-            rparamsi = OrderedDict([('label', deflabel)])
-            for param, val in _params:
-                val = safe_eval(val)
-                if param == 'path':
-                    refpath = val
-                elif param == 'format':
-                    refform = val
+        rparamsi = OrderedDict([('name', reference[4:])])
+        for param, val in cp.items(reference):
+            val = safe_eval(val)
+            if param == 'path':
+                refpath = val
+            else:
+                rparamsi[param] = val
+            try:
+                if os.path.isdir(refpath):
+                    # Section is a directory:
+                    # import all references in folder (assumes 'dat' format)
+                    for f in os.listdir(refpath):
+                        if os.path.splitext(f)[1] in ['.txt', '.dat', '.gz']:
+                            refpath += f
+                            rparamsi.setdefault(
+                                'label', os.path.basename(refpath).split('.')
+                                [0].replace('_', r' '))
+                            rparams[refpath] = rparamsi
+
                 else:
-                    rparamsi[param] = val
-            # load curve
-            refspec = Spectrum.read(refpath, format=refform)
-            rparams[refspec] = rparamsi
+                    rparamsi.setdefault(
+                        'label', os.path.basename(refpath).split('.')[0]
+                            .replace('_', r' '))
+                    rparams[refpath] = rparamsi
+            except NameError:
+                raise ValueError('Cannot load reference {0} plot if no '
+                                 'parameter "path" is defined'
+                                 .format(reference))
 
     # get combination parameters # IN PROGRESS
     combparams = OrderedDict()

dataviewer/core.py

@@ -48,16 +48,15 @@
 # fixed parameters
 PARAMS = {}
 PARAMS['figure'] = ['figsize']
-PARAMS['init'] = ['title', 'subtitle', 'xlabel', 'ylabel', 'xscale', 'yscale',
-                  'suptitle']
-PARAMS['draw'] = ['marker', 'linestyle', 'linewidth', 'linesize', 'markersize',
+PARAMS['init'] = ['title', 'xlabel', 'ylabel', 'xscale', 'yscale']
+PARAMS['draw'] = ['marker', 'linestyle', 'linewidth', 'markersize',
                   'color', 'alpha', 'norm', 'vmin', 'vmax', 'cmap']
 PARAMS['refresh'] = ['xlim', 'ylim']
 PARAMS['legend'] = ['bbox_to_anchor', 'loc', 'borderaxespad', 'ncol']
 PARAMS['colorbar'] = ['log', 'clim', 'label']
 
-FIGURE_PARAMS = ['title', 'subtitle']
-AXES_PARAMS = ['xlim', 'ylim', 'xlabel', 'ylabel']
+FIGURE_PARAMS = ['title']
+AXES_PARAMS = ['xlim', 'ylim', 'xlabel', 'ylabel', 'xscale', 'yscale']
 
 
 
@@ -70,7 +69,7 @@ class Monitor(TimedAnimation):
     # -------------------------------------------------------------------------
     # Initialise the figure
 
-    def __init__(self, fig=None, interval=1, blit=True, repeat=False,
+    def __init__(self, fig=None, interval=2, blit=True, repeat=False,
                  logger=Logger('monitor'), figname=None, save_every=1,
                  tight_bbox=False, pause=False, clock=False, **kwargs):
         self.logger = logger
@@ -85,7 +84,7 @@ def __init__(self, fig=None, interval=1, blit=True, repeat=False,
             fig = self.init_figure()
         # generate monitor
         self.interval = interval
-        super(Monitor, self).__init__(fig, interval=int(interval * 1000),
+        super(Monitor, self).__init__(fig, interval=int(100),
                                       blit=blit, repeat=repeat, **kwargs)
 
         self.figname = figname
@@ -243,16 +242,34 @@ def set_params(self, action):
                     if not isinstance(val, (list, tuple)):
                         val = [val] * len(self._fig.axes)
                     for ax, v in izip_longest(self._fig.axes, val):
-                        getattr(ax, 'set_%s' % key)(v)
+                        try:
+                            getattr(ax, 'set_%s' % key)(v)
+                        except ValueError as e:
+                            if 'too many values to unpack' in e:
+                                getattr(ax, 'set_%s' % key)(*v)
+                            else:
+                                raise
             elif key in AXES_PARAMS:
                 if not (isinstance(val, (list, tuple)) and
-                        isinstance(val[0], (list, tuple))):
+                        isinstance(val[0], (list, tuple, basestring))):
                     val = [val] * len(self._fig.axes)
                 for ax, v in zip(self._fig.axes, val):
-                    getattr(ax, 'set_%s' % key)(v)
+                    try:
+                        getattr(ax, 'set_%s' % key)(v)
+                    except ValueError as e:
+                        if 'too many values to unpack' in e:
+                            getattr(ax, 'set_%s' % key)(*v)
+                        else:
+                            raise
             else:
                 for ax in self._fig.axes:
-                    getattr(ax, 'set_%s' % key)(val)
+                    try:
+                        getattr(ax, 'set_%s' % key)(val)
+                    except ValueError as e:
+                        if 'too many values to unpack' in e:
+                            getattr(ax, 'set_%s' % key)(*val)
+                        else:
+                            raise
 
     # -------------------------------------------------------------------------
     # Event connections

dataviewer/data.py

@@ -60,7 +60,7 @@ def __init__(self, *channels, **kwargs):
 
         # separate keyword arguments
         buffkeys = ['host', 'port', 'connection', 'interval', 'duration', 'pad',
-                    'gap']
+                    'gap', 'attempts']
         buffargs = {'logger': kwargs.get('logger')}
         for key in buffkeys:
             if key in kwargs: