From 1ddfd0a708df0c576745e1be7071e253ddcba0ef Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Fri, 16 Jun 2023 17:19:13 +0200 Subject: [PATCH 1/2] Update P800-2 item_gen yml with selected IRs - also a minor update to generate_test.py script for specifying background noise per lab --- .../P800-2/config/item_gen_P800-2_b.yml | 14 +++++----- .../P800-2/config/item_gen_P800-2_d.yml | 28 +++++++++---------- generate_test.py | 9 ++++-- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/experiments/selection/P800-2/config/item_gen_P800-2_b.yml b/experiments/selection/P800-2/config/item_gen_P800-2_b.yml index b51b6cc7..e326b9c3 100644 --- a/experiments/selection/P800-2/config/item_gen_P800-2_b.yml +++ b/experiments/selection/P800-2/config/item_gen_P800-2_b.yml @@ -107,49 +107,49 @@ scenes: name: "cat1/a1s01.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f1s01.wav", "m1s01.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_2: name: "cat1/a1s02.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m2s01.wav", "f2s01.wav"] - IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_3: name: "cat1/a1s03.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f3s01.wav", "m3s01.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_4: name: "cat1/a1s04.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m1s02.wav", "f1s02.wav"] - IR: ["Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_5: name: "cat1/a1s05.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f2s02.wav", "m2s02.wav"] - IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_6: name: "cat1/a1s06.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m3s02.wav", "f3s02.wav"] - IR: ["Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_7: name: "cat1/a1s07.wav" description: "Preliminary: Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f1s13.wav", "m1s13.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat2_1: diff --git a/experiments/selection/P800-2/config/item_gen_P800-2_d.yml b/experiments/selection/P800-2/config/item_gen_P800-2_d.yml index 923778e6..841cfe64 100644 --- a/experiments/selection/P800-2/config/item_gen_P800-2_d.yml +++ b/experiments/selection/P800-2/config/item_gen_P800-2_d.yml @@ -107,98 +107,98 @@ scenes: name: "cat1/a1s01.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f1s01.wav", "m1s01.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_2: name: "cat1/a1s02.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m2s01.wav", "f2s01.wav"] - IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_3: name: "cat1/a1s03.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f3s01.wav", "m3s01.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_4: name: "cat1/a1s04.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m1s02.wav", "f1s02.wav"] - IR: ["Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_5: name: "cat1/a1s05.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f2s02.wav", "m2s02.wav"] - IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_6: name: "cat1/a1s06.wav" description: "Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["m3s02.wav", "f3s02.wav"] - IR: ["Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat1_7: name: "cat1/a1s07.wav" description: "Preliminary: Car with AB microphone pickup, no overlap between the talkers, car noise." source: ["f1s13.wav", "m1s13.wav"] - IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] + IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"] overlap: -1.0 cat2_1: name: "cat2/a2s01.wav" description: "Car with AB microphone pickup, no overlap between the talkers, street noise." source: ["m3s03.wav", "f3s03.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos1.wav", "FreeField_IR_Python_AB_20cm_Pos4.wav"] + IR: ["Nokia_FreefieldFloor_0deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-60deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_2: name: "cat2/a2s02.wav" description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["f1s03.wav", "m1s03.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos0.wav", "FreeField_IR_Python_AB_20cm_Pos1.wav"] + IR: ["Nokia_FreefieldFloor_60deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_30deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_3: name: "cat2/a2s03.wav" description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["m2s03.wav", "f2s03.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos2.wav", "FreeField_IR_Python_AB_20cm_Pos0.wav"] + IR: ["Nokia_FreefieldFloor_-135deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_135deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_4: name: "cat2/a2s04.wav" description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["f3s04.wav", "m3s04.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos1.wav", "FreeField_IR_Python_AB_20cm_Pos3.wav"] + IR: ["Nokia_FreefieldFloor_30deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-30deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_5: name: "cat2/a2s05.wav" description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["m1s04.wav", "f1s04.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos4.wav", "FreeField_IR_Python_AB_20cm_Pos2.wav"] + IR: ["Nokia_FreefieldFloor_-30deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_0deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_6: name: "cat2/a2s06.wav" description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["f2s04.wav", "m2s04.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos3.wav", "FreeField_IR_Python_AB_20cm_Pos0.wav"] + IR: ["Nokia_FreefieldFloor_90deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-90deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat2_7: name: "cat2/a2s07.wav" description: "Preliminary: Street conversation with AB microphone pickup, no overlap between the talkers, street noise." source: ["m2s13.wav", "f2s13.wav"] - IR: ["FreeField_IR_Python_AB_20cm_Pos0.wav", "FreeField_IR_Python_AB_20cm_Pos1.wav"] + IR: ["Nokia_FreefieldFloor_60deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-60deg_M5_ORTF_MLS_2chn.wav"] overlap: -1.0 cat3_1: diff --git a/generate_test.py b/generate_test.py index d5648b41..59cf0cf4 100755 --- a/generate_test.py +++ b/generate_test.py @@ -114,9 +114,14 @@ def create_experiment_setup(experiment, lab) -> list[Path]: suffix = cat + f"-lab_{lab}" input_path = base_path.joinpath("proc_input").joinpath(cat) output_path = base_path.joinpath("proc_output").joinpath(suffix) - bg_noise_path = base_path.joinpath("background_noise").joinpath( + if experiment == "P800-2": + bg_noise_path = base_path.joinpath("background_noise").joinpath( + f"background_noise_{suffix}.wav" + ) + else: + bg_noise_path = base_path.joinpath("background_noise").joinpath( f"background_noise_{cat}.wav" - ) + ) cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") cfgs.append(cfg_path) -- GitLab From b7ae10c707177ba65082c0c0277617c349d8b397 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Mon, 19 Jun 2023 08:56:55 +0200 Subject: [PATCH 2/2] formating --- generate_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_test.py b/generate_test.py index 59cf0cf4..702f33cb 100755 --- a/generate_test.py +++ b/generate_test.py @@ -120,7 +120,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]: ) else: bg_noise_path = base_path.joinpath("background_noise").joinpath( - f"background_noise_{cat}.wav" + f"background_noise_{cat}.wav" ) cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") cfgs.append(cfg_path) -- GitLab