From d56b1bf95e82d7cda57b27babf8970bd8b0d5ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaquier=20Aur=C3=A9lien=20Tristan?= Date: Thu, 21 Nov 2024 10:51:57 +0100 Subject: [PATCH 1/2] Fix setting mismatch when doing absolute amplitude extraction Change-Id: I3936f2f3b6f90bcb46738c839b75acd225d60a07 --- bluepyemodel/emodel_pipeline/emodel_settings.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bluepyemodel/emodel_pipeline/emodel_settings.py b/bluepyemodel/emodel_pipeline/emodel_settings.py index 140097d1..527fa026 100644 --- a/bluepyemodel/emodel_pipeline/emodel_settings.py +++ b/bluepyemodel/emodel_pipeline/emodel_settings.py @@ -408,6 +408,15 @@ def __init__( # Specific to threshold based optimisation self.name_Rin_protocol = name_Rin_protocol self.name_rmp_protocol = name_rmp_protocol + if self.extract_absolute_amplitudes and ( + self.name_Rin_protocol is not None or self.name_rmp_protocol is not None + ): + self.name_Rin_protocol = None + self.name_rmp_protocol = None + logger.warning( + "Setting threshold-based amplitude related settings " + "'name_rmp_protocol' and 'name_Rin_protocol' to None because " + "extract_absolute_amplitudes setting is set to True") self.strict_holding_bounds = strict_holding_bounds # Settings related to the validation From 4bd15a27d55ce63b4a16c37e1cd1b788070b939c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaquier=20Aur=C3=A9lien=20Tristan?= Date: Thu, 21 Nov 2024 11:04:04 +0100 Subject: [PATCH 2/2] black fix Change-Id: Ia3abea7eb5ffffb9634e857730f7ba45ea2ddbf3 --- bluepyemodel/emodel_pipeline/emodel_settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bluepyemodel/emodel_pipeline/emodel_settings.py b/bluepyemodel/emodel_pipeline/emodel_settings.py index 527fa026..07998015 100644 --- a/bluepyemodel/emodel_pipeline/emodel_settings.py +++ b/bluepyemodel/emodel_pipeline/emodel_settings.py @@ -416,7 +416,8 @@ def __init__( logger.warning( "Setting threshold-based amplitude related settings " "'name_rmp_protocol' and 'name_Rin_protocol' to None because " - "extract_absolute_amplitudes setting is set to True") + "extract_absolute_amplitudes setting is set to True" + ) self.strict_holding_bounds = strict_holding_bounds # Settings related to the validation