Skip to content

Commit 93a66c1

Browse files
Update data summary
1 parent a0c31a8 commit 93a66c1

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

scripts/inner_ear/analysis/common.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import os
1+
# import os
22
import sys
33

44
import pandas as pd
@@ -46,11 +46,13 @@ def get_measurements_with_annotation():
4646

4747

4848
def get_all_measurements():
49-
data_root = get_data_root()
50-
val_table = os.path.join(data_root, "Electron-Microscopy-Susi", "Validierungs-Tabelle-v3.xlsx")
49+
# data_root = get_data_root()
50+
# val_table = os.path.join(data_root, "Electron-Microscopy-Susi", "Validierungs-Tabelle-v3.xlsx")
51+
52+
val_table = "/home/pape/Desktop/sfb1286/mboc_synapse/misc/Validierungs-Tabelle-v3-passt.xlsx"
5153
val_table = pd.read_excel(val_table)
5254

53-
val_table = val_table[val_table["Kommentar 27-10-24"] == "passt"]
55+
val_table = val_table[val_table["Kommentar 22.11.24"] == "passt"]
5456
n_tomos = len(val_table)
5557
print("All tomograms:", n_tomos)
5658
assert n_tomos > 0

scripts/summarize_data.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,38 @@ def summarize_vesicle_train_data():
6565
for condition in conditions:
6666
ctab = vesicle_train[vesicle_train.condition == condition]
6767
n_tomos = len(ctab)
68-
n_vesicles = ctab["vesicle_count"].sum()
68+
n_vesicles_all = ctab["vesicle_count_all"].sum()
69+
n_vesicles_imod = ctab["vesicle_count_imod"].sum()
6970
print(condition)
7071
print("Tomograms:", n_tomos)
71-
print("Vesicles:", n_vesicles)
72+
print("All-Vesicles:", n_vesicles_all)
73+
print("Vesicles-From-Manual:", n_vesicles_imod)
7274
print()
7375
condition_summary["Condition"].append(condition)
7476
condition_summary["Tomograms"].append(n_tomos)
75-
condition_summary["Vesicles"].append(n_vesicles)
77+
condition_summary["Vesicles"].append(n_vesicles_all)
7678
condition_summary = pd.DataFrame(condition_summary)
79+
print()
80+
print()
7781

7882
print("Total:")
7983
print("Tomograms:", len(vesicle_train))
80-
print("Vesicles:", vesicle_train["vesicle_count"].sum())
84+
print("All-Vesicles:", vesicle_train["vesicle_count_all"].sum())
85+
print("Vesicles-From-Manual:", vesicle_train["vesicle_count_imod"].sum())
8186
print()
8287

8388
train_tomos = vesicle_train[vesicle_train.used_for == "train/val"]
8489
print("Training:")
8590
print("Tomograms:", len(train_tomos))
86-
print("Vesicles:", train_tomos["vesicle_count"].sum())
91+
print("All-Vesicles:", train_tomos["vesicle_count_all"].sum())
92+
print("Vesicles-From-Manual:", train_tomos["vesicle_count_imod"].sum())
8793
print()
8894

8995
test_tomos = vesicle_train[vesicle_train.used_for == "test"]
9096
print("Test:")
9197
print("Tomograms:", len(test_tomos))
92-
print("Vesicles:", test_tomos["vesicle_count"].sum())
98+
print("All-Vesicles:", test_tomos["vesicle_count_all"].sum())
99+
print("Vesicles-From-Manual:", test_tomos["vesicle_count_imod"].sum())
93100

94101
pie_chart(condition_summary, "Tomograms", "Tomograms per Condition")
95102
pie_chart(condition_summary, "Vesicles", "Vesicles per Condition")
@@ -148,7 +155,7 @@ def summarize_compartment_train():
148155

149156

150157
# training_resolutions()
151-
# summarize_vesicle_train_data()
158+
summarize_vesicle_train_data()
152159
# summarize_vesicle_da()
153-
summarize_az_train()
154-
summarize_compartment_train()
160+
# summarize_az_train()
161+
# summarize_compartment_train()

0 commit comments

Comments
 (0)