Skip to content

Commit daf9b5a

Browse files
committed
WIP
1 parent 16f4ed2 commit daf9b5a

10 files changed

+464
-50
lines changed

cellpack_analysis/analysis/notebooks/biological_variation.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
STRUCTURE_NAME = "peroxisome"
3030
# %% [markdown]
3131
# ### Set packing modes to analyze
32-
save_format = "svg"
32+
save_format = "pdf"
3333
packing_modes = [
3434
"mean_count_and_size",
3535
"variable_count",
@@ -54,7 +54,7 @@
5454
base_datadir = project_root / "data"
5555
base_results_dir = project_root / "results"
5656

57-
results_dir = base_results_dir / f"biological_variation/{STRUCTURE_NAME}"
57+
results_dir = base_results_dir / f"biological_variation/{STRUCTURE_NAME}/update_emd/"
5858
results_dir.mkdir(exist_ok=True, parents=True)
5959

6060
figures_dir = results_dir / "figures"
@@ -100,7 +100,7 @@
100100
combined_mesh_information_dict[structure_id] = mesh_information_dict
101101
# %% [markdown]
102102
# ### Calculate distance measures and normalize
103-
all_distance_dict = distance.get_distance_dictionary(
103+
all_distance_dict = distance.get_distance_dictionary_serial(
104104
all_positions=all_positions,
105105
distance_measures=distance_measures,
106106
mesh_information_dict=combined_mesh_information_dict,
@@ -133,9 +133,8 @@
133133
figures_dir=distance_figures_dir,
134134
suffix=suffix,
135135
normalization=normalization,
136-
overlay=True,
137136
distance_limits=DISTANCE_LIMITS,
138-
bandwidth=0.4,
137+
bandwidth=0.2,
139138
save_format=save_format,
140139
)
141140
# %% [markdown]
@@ -176,12 +175,14 @@
176175
figures_dir=emd_figures_dir,
177176
suffix=suffix,
178177
save_format=save_format,
179-
annotate_significance=True,
178+
annotate_significance=False,
180179
)
181180
# %% [markdown]
182181
# ### Log statistics for EMD comparisons
183-
emd_log_file_path = results_dir / f"{STRUCTURE_NAME}_emd_central_tendencies{suffix}.log"
184182
for comparison_type in ["intra_mode", "baseline"]:
183+
emd_log_file_path = (
184+
results_dir / f"{STRUCTURE_NAME}_emd_central_tendencies_{comparison_type}{suffix}.log"
185+
)
185186
distance.log_central_tendencies_for_emd(
186187
df_emd=df_emd,
187188
distance_measures=distance_measures,
@@ -190,3 +191,5 @@
190191
log_file_path=emd_log_file_path,
191192
comparison_type=comparison_type,
192193
)
194+
195+
# %%

0 commit comments

Comments
 (0)