roll back edit

INM-6 · Sep 12, 2024 · f66b149 · f66b149
1 parent 045e4a1
commit f66b149
Showing 1 changed file with 38 additions and 48 deletions.
diff --git a/mesocircuit/plotting/ms_figures.py b/mesocircuit/plotting/ms_figures.py
@@ -196,56 +196,46 @@ def reference_vs_upscaled(output_dir, ref_circuit, ups_circuit,
 
     if plot_statistics:
         print('Plotting statistics.')
+        fig = plt.figure(figsize=(ref_circuit.plot_dict['fig_width_2col'], 6))
+        gs = gridspec.GridSpec(2, 1)
+        gs.update(left=0.08, right=0.99, bottom=0.08, top=0.93, hspace=0.5)
 
-        def _plotting_statistics(key_ccs):
-            fig = plt.figure(figsize=(ref_circuit.plot_dict['fig_width_2col'], 6))
-            gs = gridspec.GridSpec(2, 1)
-            gs.update(left=0.08, right=0.99, bottom=0.08, top=0.93, hspace=0.5)
-
-            labels = [['A', 'B', 'C', 'D', 'E', 'F', 'G'],
-                    ['H', 'I', 'J', 'K', 'L', 'M', 'N']]
-
-            titles = ['reference model, ' + r'1 mm$^2$',
-                    'upscaled model, ' + r'1 mm$^2$ sampled']
-
-            for i, prefix in enumerate(['ref', 'ups']):
-                all_CCs = {}
-                all_CCs_distances = d[prefix + '_all_CCs_distances']
-                for X in all_CCs_distances:
-                    if isinstance(all_CCs_distances[X], h5py._hl.group.Group):
-                        all_CCs[X] = all_CCs_distances[X][key_ccs]
-                    else:
-                        all_CCs[X] = np.array([])
-
-                axes = plot.plot_statistics_overview(
-                    gs[i],
-                    d[prefix + '_all_FRs'],
-                    d[prefix + '_all_LVs'],
-                    all_CCs,
-                    d[prefix + '_all_PSDs'],
-                    ref_circuit.ana_dict['Y'],
-                    ref_circuit.plot_dict,
-                    ylims_boxcharts_FRs=[0., 11.],
-                    ylims_boxcharts_LVs=[0., 2.],
-                    ylims_boxcharts_CCs=[-0.01, 0.01],
-                    ylims_PSDs=[0.00001, 10])
-                for l, label in enumerate(labels[i]):
-                    plot.add_label(axes[l], label)
-                axes[4].set_title(titles[i], pad=15)
-
-            return fig
-
-        try:
-            # stats plot for different time bins 
-            for i, ccs_time_interval in enumerate(iter(circuit.ana_dict['ccs_time_interval'])):
-                    key_ccs = f'ccs_{ccs_time_interval}'
-                    fig = _plotting_statistics(key_ccs)
-                    fig.savefig(os.path.join(output_dir, f'rev_vs_ups_statistics_delta{ccs_time_interval}ms.pdf'))
-        except TypeError as _:
-            ccs_time_interval = circuit.ana_dict['ccs_time_interval']
-            key_ccs = f'ccs_{ccs_time_interval}'
-            fig.savefig(os.path.join(output_dir, f'rev_vs_ups_statistics_delta{ccs_time_interval}ms.pdf'))
+        labels = [['A', 'B', 'C', 'D', 'E', 'F', 'G'],
+                  ['H', 'I', 'J', 'K', 'L', 'M', 'N']]
 
+        titles = ['reference model, ' + r'1 mm$^2$',
+                  'upscaled model, ' + r'1 mm$^2$ sampled']
+
+        interval = ref_circuit.ana_dict['ccs_time_interval']
+
+        for i, prefix in enumerate(['ref', 'ups']):
+            all_CCs = {}
+            all_CCs_distances = d[prefix + '_all_CCs_distances']
+            for X in all_CCs_distances:
+                if isinstance(all_CCs_distances[X], h5py._hl.group.Group):
+                    all_CCs[X] = all_CCs_distances[X][f'ccs_{interval}ms']
+                else:
+                    all_CCs[X] = np.array([])
+
+            axes = plot.plot_statistics_overview(
+                gs[i],
+                d[prefix + '_all_FRs'],
+                d[prefix + '_all_LVs'],
+                all_CCs,
+                d[prefix + '_all_PSDs'],
+                ref_circuit.ana_dict['Y'],
+                ref_circuit.plot_dict,
+                ylims_boxcharts_FRs=[0., 11.],
+                ylims_boxcharts_LVs=[0., 2.],
+                ylims_boxcharts_CCs=[-0.01, 0.01],
+                ylims_PSDs=[0.00001, 10])
+            for l, label in enumerate(labels[i]):
+                plot.add_label(axes[l], label)
+            axes[4].set_title(titles[i], pad=15)
+
+        plt.savefig(os.path.join(output_dir, 'rev_vs_ups_statistics.pdf'))
+
+    return
 
 def correlation(output_dir, circuit):
     """