Fixes for eventbrowser

NuRadioReco/eventbrowser/apps/simulation_plots/sim_electric_field_spectrum.py

@@ -54,7 +54,10 @@ def update_sim_spectrum_plot(i_event, filename, signal_types, station_id, juser_
     if sim_station is None:
         return {}
     fig = plotly.subplots.make_subplots(rows=1, cols=1)
-    for i_electric_field, electric_field in enumerate(sim_station.get_electric_fields()):
+    efields = list(sim_station.get_electric_fields())
+    efield_ids = [efield.get_unique_identifier() for efield in efields]
+    efields_sorted = [k[1] for k in sorted(zip(efield_ids, efields))]
+    for i_electric_field, electric_field in enumerate(efields_sorted):
         if electric_field.get_parameter(efp.ray_path_type) in signal_types:
             for polarization in range(1, 3):
                 fig.append_trace(

NuRadioReco/eventbrowser/apps/simulation_plots/sim_electric_field_trace.py

@@ -54,7 +54,10 @@ def update_sim_trace_plot(i_event, filename, signal_types, station_id, juser_id)
     if sim_station is None:
         return {}
     fig = plotly.subplots.make_subplots(rows=1, cols=1)
-    for i_electric_field, electric_field in enumerate(sim_station.get_electric_fields()):
+    efields = list(sim_station.get_electric_fields())
+    efield_ids = [efield.get_unique_identifier() for efield in efields]
+    efields_sorted = [k[1] for k in sorted(zip(efield_ids, efields))]
+    for i_electric_field, electric_field in enumerate(efields_sorted):
         if electric_field.get_parameter(efp.ray_path_type) in signal_types:
             for polarization in range(1, 3):
                 fig.append_trace(

NuRadioReco/eventbrowser/apps/trace_plots/channel_spectrum.py

@@ -4,9 +4,9 @@
 from NuRadioReco.utilities import units
 from NuRadioReco.eventbrowser.default_layout import default_layout
 import numpy as np
-from dash import dcc
+from dash import dcc, callback
 from dash.dependencies import State
-from NuRadioReco.eventbrowser.app import app
+# from NuRadioReco.eventbrowser.app import app
 import NuRadioReco.eventbrowser.dataprovider
 
 provider = NuRadioReco.eventbrowser.dataprovider.DataProvider()
@@ -16,14 +16,16 @@
 ]
 
 
-@app.callback(
+@callback(
     dash.dependencies.Output('channel-spectrum', 'figure'),
     [dash.dependencies.Input('trigger-trace', 'children'),
      dash.dependencies.Input('event-counter-slider', 'value'),
      dash.dependencies.Input('filename', 'value'),
      dash.dependencies.Input('station-id-dropdown', 'value')],
-    [State('user_id', 'children')])
-def update_channel_spectrum(trigger, evt_counter, filename, station_id, juser_id):
+    [State('user_id', 'children'),
+     State('channel-spectrum-log-linear-switch', 'children')]
+    )
+def update_channel_spectrum(trigger, evt_counter, filename, station_id, juser_id, yscale):
     if filename is None or station_id is None:
         return {}
     user_id = json.loads(juser_id)
@@ -33,27 +35,22 @@ def update_channel_spectrum(trigger, evt_counter, filename, station_id, juser_id
     station = evt.get_station(station_id)
     fig = plotly.subplots.make_subplots(rows=1, cols=1)
     for i, channel in enumerate(station.iter_channels()):
-        if channel.get_trace() is None:
+        spec = channel.get_frequency_spectrum()
+        if spec is None:
             continue
-        tt = channel.get_times()
-        dt = tt[1] - tt[0]
-        if channel.get_trace() is None:
-            continue
-        trace = channel.get_trace()
-        ff = np.fft.rfftfreq(len(tt), dt)
-        spec = np.abs(np.fft.rfft(trace, norm='ortho'))
+        freqs = channel.get_frequencies()
         fig.append_trace(plotly.graph_objs.Scatter(
-            x=ff / units.MHz,
-            y=spec / units.mV,
+            x=freqs / units.MHz,
+            y=np.abs(spec) / units.mV,
             opacity=0.7,
             marker={
                 'color': colors[i % len(colors)],
                 'line': {'color': colors[i % len(colors)]}
             },
-            name='Channel {}'.format(i)
+            name='Channel {}'.format(channel.get_id())
         ), 1, 1)
     fig['layout'].update(default_layout)
     fig['layout']['legend']['uirevision'] = filename
     fig['layout']['xaxis1'].update(title='frequency [MHz]')
-    fig['layout']['yaxis1'].update(title='amplitude [mV]')
+    fig['layout']['yaxis'].update(title='amplitude [mV]', type=yscale)
     return fig

NuRadioReco/eventbrowser/apps/trace_plots/channel_time_trace.py

@@ -4,9 +4,9 @@
 from NuRadioReco.utilities import units
 from NuRadioReco.eventbrowser.default_layout import default_layout
 import numpy as np
-from dash import dcc
+from dash import dcc, callback
 from dash.dependencies import State
-from NuRadioReco.eventbrowser.app import app
+# from NuRadioReco.eventbrowser.app import app
 import NuRadioReco.eventbrowser.dataprovider
 
 provider = NuRadioReco.eventbrowser.dataprovider.DataProvider()
@@ -16,7 +16,7 @@
 ]
 
 
-@app.callback(
+@callback(
     dash.dependencies.Output('time-trace', 'figure'),
     [dash.dependencies.Input('trigger-trace', 'children'),
      dash.dependencies.Input('event-counter-slider', 'value'),
@@ -52,8 +52,8 @@ def update_time_trace(trigger, evt_counter, filename, station_id, juser_id):
                 'color': colors[i % len(colors)],
                 'line': {'color': colors[i % len(colors)]}
             },
-            name='Channel {}'.format(i),
-            uid='Channel {}'.format(i)
+            name='Channel {}'.format(channel.get_id()),
+            uid='Channel {}'.format(channel.get_id())
         ), 1, 1)
     fig['layout'].update(default_layout)
     fig['layout']['legend']['uirevision'] = filename # only update channel selection on changing files.

NuRadioReco/eventbrowser/apps/trace_plots/multi_channel_plot.py

@@ -12,10 +12,9 @@
 from NuRadioReco.utilities import trace_utilities
 """
 import numpy as np
-from dash import html
-from dash import dcc
+from dash import dcc, html, callback
 from dash.dependencies import Input, Output, State
-from NuRadioReco.eventbrowser.app import app
+# from NuRadioReco.eventbrowser.app import app
 import os
 import NuRadioReco.detector.antennapattern
 import NuRadioReco.eventbrowser.dataprovider
@@ -72,7 +71,7 @@
 ]
 
 
-@app.callback(
+@callback(
     dash.dependencies.Output('dropdown-traces', 'options'),
     [dash.dependencies.Input('event-counter-slider', 'value'),
      dash.dependencies.Input('filename', 'value'),
@@ -99,7 +98,7 @@ def get_dropdown_traces_options(evt_counter, filename, station_id, juser_id):
     return options
 
 
-@app.callback(
+@callback(
     Output('template-input-group', 'style'),
     [Input('dropdown-traces', 'value')]
 )
@@ -117,7 +116,7 @@ def get_L1(a):
     return l1
 
 
-@app.callback(
+@callback(
     dash.dependencies.Output('time-traces', 'figure'),
     [dash.dependencies.Input('event-counter-slider', 'value'),
      dash.dependencies.Input('filename', 'value'),
@@ -126,9 +125,11 @@ def get_L1(a):
      dash.dependencies.Input('station-id-dropdown', 'value'),
      dash.dependencies.Input('open-template-button', 'n_clicks_timestamp')],
     [State('user_id', 'children'),
-     State('template-directory-input', 'value')])
+     State('template-directory-input', 'value'),
+     State('channel-spectrum-log-linear-switch', 'children')]
+)
 def update_multi_channel_plot(evt_counter, filename, dropdown_traces, dropdown_info, station_id,
-                              open_template_timestamp, juser_id, template_directory):
+                              open_template_timestamp, juser_id, template_directory, yscale):
     if filename is None or station_id is None:
         return {}
     user_id = json.loads(juser_id)
@@ -420,6 +421,7 @@ def update_multi_channel_plot(evt_counter, filename, dropdown_traces, dropdown_i
         fig['layout']['yaxis{:d}'.format(i * 2 + 1)].update(
             title='<b>Ch. {}</b><br>voltage [mV]'.format(channel_id)
         )
+        fig['layout']['yaxis{:d}'.format(i * 2 + 2)].update(type=yscale)
 
         if channel.get_trace() is None:
             continue

NuRadioReco/eventbrowser/apps/trace_plots/rec_electric_field_spectrum.py

@@ -4,7 +4,7 @@
 from NuRadioReco.utilities import units
 from NuRadioReco.eventbrowser.default_layout import default_layout
 import numpy as np
-from dash import dcc
+from dash import dcc, html
 from dash.dependencies import State
 from NuRadioReco.eventbrowser.app import app
 import NuRadioReco.eventbrowser.dataprovider
@@ -22,8 +22,9 @@
      dash.dependencies.Input('event-counter-slider', 'value'),
      dash.dependencies.Input('filename', 'value'),
      dash.dependencies.Input('station-id-dropdown', 'value')],
-    [State('user_id', 'children')])
-def update_efield_spectrum(trigger, evt_counter, filename, station_id, juser_id):
+    [State('user_id', 'children'),
+     State('channel-spectrum-log-linear-switch', 'children')])
+def update_efield_spectrum(trigger, evt_counter, filename, station_id, juser_id, yscale):
     if filename is None or station_id is None:
         return {}
     user_id = json.loads(juser_id)
@@ -61,5 +62,5 @@ def update_efield_spectrum(trigger, evt_counter, filename, station_id, juser_id)
         ), 1, 1)
     fig['layout'].update(default_layout)
     fig['layout']['xaxis1'].update(title='frequency [MHz]')
-    fig['layout']['yaxis1'].update(title='amplitude [mV/m]')
+    fig['layout']['yaxis'].update(title='amplitude [mV/m]', type=yscale)
     return fig

NuRadioReco/eventbrowser/apps/traces.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function  # , unicode_literals
-from dash import html
+from dash import html, no_update
 import NuRadioReco.eventbrowser.apps.trace_plots.rec_electric_field_trace
 import NuRadioReco.eventbrowser.apps.trace_plots.rec_electric_field_spectrum
 import NuRadioReco.eventbrowser.apps.trace_plots.channel_time_trace
@@ -27,6 +27,9 @@
         html.Div([
             html.Div([
                 'Electric Field Spectrum',
+                ' (y-scale:  ',
+                html.Button(id='efield-spectrum-log-linear-switch', children='linear'),
+                ')',
                 html.Button('Show', id='toggle_efield_spectrum', n_clicks=0, style={'float':'right'})
             ], className='panel-heading'),
             html.Div(NuRadioReco.eventbrowser.apps.trace_plots.rec_electric_field_spectrum.layout,
@@ -45,6 +48,9 @@
         html.Div([
             html.Div([
                 'Channel Spectrum', 
+                ' (y-scale:  ',
+                html.Button(id='channel-spectrum-log-linear-switch', children='linear'),
+                ')',
                 html.Button('Show', id='toggle_channel_spectrum', n_clicks=0, style={'float':'right'})
                 ], className='panel-heading'),
             html.Div(NuRadioReco.eventbrowser.apps.trace_plots.channel_spectrum.layout,
@@ -60,53 +66,96 @@
 ])
 
 @app.callback(
-    [Output('channel_traces_layout', 'children'),
+    [Output('channel_traces_layout', 'style'),
     Output('toggle_channel_traces', 'children')],
     [Input('toggle_channel_traces', 'n_clicks')],
     State('toggle_channel_traces', 'children'),
     prevent_initial_callbacks=True
 )
 def toggle_channel_trace_plot(button_clicks, showhide):
     if showhide == 'Hide':
-        return [], 'Show'
+        return {'flex': '1', 'display': 'none'}, 'Show'
     else:
-        return NuRadioReco.eventbrowser.apps.trace_plots.channel_time_trace.layout, 'Hide'
+        return {'flex' : '1'}, 'Hide'
 
 @app.callback(
-    [Output('channel_spectrum_layout', 'children'),
+    [Output('channel_spectrum_layout', 'style'),
     Output('toggle_channel_spectrum', 'children')],
     [Input('toggle_channel_spectrum', 'n_clicks')],
     State('toggle_channel_spectrum', 'children'),
     prevent_initial_callbacks=True
 )
 def toggle_channel_spectrum_plot(button_clicks, showhide):
     if showhide == 'Hide':
-        return [], 'Show'
+        return {'flex': '1', 'display': 'none'}, 'Show'
     else:
-        return NuRadioReco.eventbrowser.apps.trace_plots.channel_spectrum.layout, 'Hide'
+        return {'flex': '1'}, 'Hide'
 
 @app.callback(
-    [Output('efield_traces_layout', 'children'),
+    [Output('efield_traces_layout', 'style'),
     Output('toggle_efield_traces', 'children')],
     [Input('toggle_efield_traces', 'n_clicks')],
     State('toggle_efield_traces', 'children'),
     prevent_initial_callbacks=True
 )
 def toggle_efield_traces_plot(button_clicks, showhide):
     if showhide == 'Hide':
-        return [], 'Show'
+        return {'flex': '1', 'display': 'none'}, 'Show'
     else:
-        return NuRadioReco.eventbrowser.apps.trace_plots.rec_electric_field_trace.layout, 'Hide'
+        return {'flex': '1'}, 'Hide'
 
 @app.callback(
-    [Output('efield_spectrum_layout', 'children'),
+    [Output('efield_spectrum_layout', 'style'),
     Output('toggle_efield_spectrum', 'children')],
     [Input('toggle_efield_spectrum', 'n_clicks')],
     State('toggle_efield_spectrum', 'children'),
     prevent_initial_callbacks=True
 )
 def toggle_efield_spectrum_plot(button_clicks, showhide):
     if showhide == 'Hide':
-        return [], 'Show'
+        return {'flex': '1', 'display': 'none'}, 'Show'
     else:
-        return NuRadioReco.eventbrowser.apps.trace_plots.rec_electric_field_spectrum.layout, 'Hide'
+        return {'flex': '1'}, 'Hide'
+
+# callback to change frequency spectra between linear and log scale
+@app.callback(
+    [Output('efield-spectrum', 'figure', allow_duplicate=True), # this is a 'duplicate' callback - requires dash >= 2.9
+     Output('channel-spectrum', 'figure', allow_duplicate=True), # this is a 'duplicate' callback - requires dash >= 2.9
+     Output('time-traces', 'figure', allow_duplicate=True),
+     Output('channel-spectrum-log-linear-switch', 'children'),
+     Output('efield-spectrum-log-linear-switch', 'children')
+    ],
+    [Input('channel-spectrum-log-linear-switch', 'n_clicks'),
+     Input('efield-spectrum-log-linear-switch', 'n_clicks')],
+    [State('channel-spectrum-log-linear-switch', 'children'),
+     State('efield-spectrum', 'figure'),
+     State('channel-spectrum', 'figure'),
+     State('time-traces', 'figure'),
+    ], prevent_initial_call=True
+)
+def toggle_linear_log_scale(button_clicks, button2_clicks, button_current_value, efield_spectrum, channel_spectrum, multichannel_plot):
+    outputs = []
+    if button_current_value == 'linear': # switch to log
+        new_value = 'log'
+    else:
+        new_value = 'linear'
+    for spectrum_plot in [efield_spectrum, channel_spectrum]:
+        try:
+            spectrum_plot['layout']['yaxis']['type'] = new_value
+            outputs.append(spectrum_plot)
+        except KeyError:
+            outputs.append(no_update)
+
+    try:
+        yaxes = [key for key in multichannel_plot['layout'].keys() if 'yaxis' in key]
+        yaxes = [key for key in yaxes if len(key)>5] # omit key 'yaxis'
+        yaxes_even = [key for key in yaxes if not (int(key.split('yaxis')[-1]) % 2)]
+        for yaxis in yaxes_even:
+            multichannel_plot['layout'][yaxis]['type'] = new_value
+        outputs.append(multichannel_plot)
+    except KeyError as e:
+        outputs.append(no_update)
+
+    outputs.append(new_value)
+    outputs.append(new_value)
+    return outputs