Update frequency mapping plots to accept custom bins

Author: constantinpape

scripts/figures/plot_fig6.py

@@ -153,16 +153,26 @@ def fig_06e_octave(otof_data, save_path, plot=False, use_alias=True, trendline_m
         color_dict[alias] = COCHLEAE_DICT[name]["color"]
         if mapping == "default":
             freq = values["frequency[kHz]"].values
+            bin_edges, bin_labels = None, None
         elif mapping == "mueller":
             freq = values["frequency-mueller[kHz]"].values
+            # We need custom bin edges and bin labels in this case.
+            bin_edges = [0, 8, 12, 16, 24, np.inf]
+            bin_labels = [
+                "4-8", "8-12", "12–16", "16-24", "24-32"
+            ]
+            assert len(bin_edges) == len(bin_labels) + 1
         else:
             raise ValueError("Choose either 'default' or 'mueller' for tonotopic mapping.")
         marker_labels = values["expression_classification"].values
         marker_pos = len([1 for i in marker_labels if i == 1])
         marker_neg = len([1 for i in marker_labels if i == 2])
         expression_eff = marker_pos / (marker_pos + marker_neg)
         print(f"Cochlea {name}, average expression efficiency {expression_eff}")
-        octave_binned = frequency_mapping(freq, marker_labels, animal="mouse", transduction_efficiency=True)
+        octave_binned = frequency_mapping(
+            freq, marker_labels, animal="mouse", transduction_efficiency=True,
+            bin_edges=bin_edges, bin_labels=bin_labels
+        )
 
         result["cochlea"].extend([alias] * len(octave_binned))
         result["octave_band"].extend(octave_binned.axes[0].values.tolist())

scripts/figures/util.py

@@ -144,9 +144,13 @@ def _get_mapping(animal):
     return bin_edges, bin_labels
 
 
-def frequency_mapping(frequencies, values, animal="mouse", transduction_efficiency=False):
+def frequency_mapping(
+    frequencies, values, animal="mouse", transduction_efficiency=False, bin_edges=None, bin_labels=None
+):
     # Get the mapping of frequencies to octave bands for the given species.
-    bin_edges, bin_labels = _get_mapping(animal)
+    if bin_edges is None:
+        assert bin_labels is None
+        bin_edges, bin_labels = _get_mapping(animal)
 
     # Construct the data frame with octave bands.
     df = pd.DataFrame({"freq_khz": frequencies, "value": values})