From 58040afde7cfe4e0dfa6e8e17f87bc2cf565e95b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 11 Sep 2025 09:38:30 +0200 Subject: [PATCH] fix collection scripts for P800-14 with different dir structure also add the intended output structure for P800-14 for clarity --- collection-scripts/characterization/p800_categorized_samples.py | 2 +- collection-scripts/characterization/p800_preliminaries.py | 2 +- .../P800-14/proc_output/{cat1 => cat1_1TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat1 => cat1_1TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat1 => cat1_1TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat2 => cat1_2TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat2 => cat1_2TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat2 => cat1_2TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat3 => cat2_1TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat3 => cat2_1TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat3 => cat2_1TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat4 => cat2_2TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat4 => cat2_2TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat4 => cat2_2TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat5 => cat3_1TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat5 => cat3_1TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat5 => cat3_1TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat6 => cat3_2TC}/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat6 => cat3_2TC}/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/{cat6 => cat3_2TC}/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_1TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_1TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_1TC/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_2TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_2TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat4_2TC/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_1TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_1TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_1TC/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_2TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_2TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat5_2TC/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_1TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_1TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_1TC/out_-36LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_2TC/out_-16LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_2TC/out_-26LKFS/.gitkeep | 0 .../P800-14/proc_output/cat6_2TC/out_-36LKFS/.gitkeep | 0 38 files changed, 2 insertions(+), 2 deletions(-) rename experiments/characterization/P800-14/proc_output/{cat1 => cat1_1TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat1 => cat1_1TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat1 => cat1_1TC}/out_-36LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat2 => cat1_2TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat2 => cat1_2TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat2 => cat1_2TC}/out_-36LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat3 => cat2_1TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat3 => cat2_1TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat3 => cat2_1TC}/out_-36LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat4 => cat2_2TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat4 => cat2_2TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat4 => cat2_2TC}/out_-36LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat5 => cat3_1TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat5 => cat3_1TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat5 => cat3_1TC}/out_-36LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat6 => cat3_2TC}/out_-16LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat6 => cat3_2TC}/out_-26LKFS/.gitkeep (100%) rename experiments/characterization/P800-14/proc_output/{cat6 => cat3_2TC}/out_-36LKFS/.gitkeep (100%) create mode 100644 experiments/characterization/P800-14/proc_output/cat4_1TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat4_1TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat4_1TC/out_-36LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat4_2TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat4_2TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat4_2TC/out_-36LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_1TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_1TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_1TC/out_-36LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_2TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_2TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat5_2TC/out_-36LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_1TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_1TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_1TC/out_-36LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_2TC/out_-16LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_2TC/out_-26LKFS/.gitkeep create mode 100644 experiments/characterization/P800-14/proc_output/cat6_2TC/out_-36LKFS/.gitkeep diff --git a/collection-scripts/characterization/p800_categorized_samples.py b/collection-scripts/characterization/p800_categorized_samples.py index f889bf3e..fcbbe6cc 100644 --- a/collection-scripts/characterization/p800_categorized_samples.py +++ b/collection-scripts/characterization/p800_categorized_samples.py @@ -79,7 +79,7 @@ def copy_final_items(verbose: bool = False): for category, loudness in categories_map.items(): item_dir_pattern = ( proc_output - / glob.escape(category) + / f"{glob.escape(category)}*" / f"out_{glob.escape(str(loudness))}LKFS" / "c*" ) diff --git a/collection-scripts/characterization/p800_preliminaries.py b/collection-scripts/characterization/p800_preliminaries.py index ca2aa963..2055be3e 100644 --- a/collection-scripts/characterization/p800_preliminaries.py +++ b/collection-scripts/characterization/p800_preliminaries.py @@ -59,7 +59,7 @@ def copy_preliminaries(root_dir, config_yaml): # Find the condition folder in proc_output for proc_out in proc_out_list: - src = proc_out / cat / f"out_{LOUDNESS_MAP[cat]}LKFS" / cond + src = proc_out / f"{cat}*" / f"out_{LOUDNESS_MAP[cat]}LKFS" / cond for file in glob.glob(str(src / "*s07.c*.wav")): print(f" Copying {file} -> {out_dir}") diff --git a/experiments/characterization/P800-14/proc_output/cat1/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_1TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat1/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_1TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat1/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_1TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat1/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_1TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat1/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_1TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat1/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_1TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat2/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_2TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat2/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_2TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat2/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_2TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat2/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_2TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat2/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat1_2TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat2/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat1_2TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat3/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_1TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat3/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_1TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat3/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_1TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat3/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_1TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat3/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_1TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat3/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_1TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat4/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_2TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat4/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_2TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat4/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_2TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat4/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_2TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat4/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat2_2TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat4/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat2_2TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat5/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_1TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat5/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_1TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat5/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_1TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat5/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_1TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat5/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_1TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat5/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_1TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat6/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_2TC/out_-16LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat6/out_-16LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_2TC/out_-16LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat6/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_2TC/out_-26LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat6/out_-26LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_2TC/out_-26LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat6/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat3_2TC/out_-36LKFS/.gitkeep similarity index 100% rename from experiments/characterization/P800-14/proc_output/cat6/out_-36LKFS/.gitkeep rename to experiments/characterization/P800-14/proc_output/cat3_2TC/out_-36LKFS/.gitkeep diff --git a/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_1TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat4_2TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_1TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat5_2TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_1TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-16LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-16LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-26LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-26LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-36LKFS/.gitkeep b/experiments/characterization/P800-14/proc_output/cat6_2TC/out_-36LKFS/.gitkeep new file mode 100644 index 00000000..e69de29b -- GitLab