Skip to content

Commit

Permalink
Merge pull request #84 from BlueBrain/fix-default-std-value
Browse files Browse the repository at this point in the history
Fix: FCC Ignoring 'default_std_value' parameter issue
  • Loading branch information
ilkilic authored Nov 27, 2023
2 parents f8b2742 + 4d22992 commit ca5c960
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions bluepyemodel/efeatures_extraction/efeatures_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ def extract_save_features_protocols(access_point, mapper=map):
name_rin_protocol=access_point.pipeline_settings.name_Rin_protocol,
validation_protocols=access_point.pipeline_settings.validation_protocols,
stochasticity=access_point.pipeline_settings.stochasticity,
default_std_value=access_point.pipeline_settings.default_std_value,
)

fitness_calculator_config.init_from_bluepyefe(
Expand Down
5 changes: 5 additions & 0 deletions bluepyemodel/evaluation/fitness_calculator_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ def __init__(
self.name_rin_protocol = name_rin_protocol

self.workflow_id = None
self.default_std_value = default_std_value

def protocol_exist(self, protocol_name):
return bool(p for p in self.protocols if p.name == protocol_name)
Expand Down Expand Up @@ -281,6 +282,7 @@ def _add_bluepyefe_efeature(self, feature, protocol_name, recording, threshold_e
efel_settings=feature.get("efel_settings", {}),
threshold_efeature_std=threshold_efeature_std,
sample_size=feature.get("n", None),
default_std_value=self.default_std_value,
)

if (
Expand Down Expand Up @@ -350,6 +352,7 @@ def init_from_bluepyefe(self, efeatures, protocols, currents, threshold_efeature
mean=currents["holding_current"][0],
std=currents["holding_current"][1],
threshold_efeature_std=threshold_efeature_std,
default_std_value=self.default_std_value,
)
)

Expand All @@ -361,6 +364,7 @@ def init_from_bluepyefe(self, efeatures, protocols, currents, threshold_efeature
mean=currents["threshold_current"][0],
std=currents["threshold_current"][1],
threshold_efeature_std=threshold_efeature_std,
default_std_value=self.default_std_value,
)
)

Expand Down Expand Up @@ -425,6 +429,7 @@ def _add_legacy_efeature(self, feature, protocol_name, recording, threshold_efea
efeature_name=feature.get("efeature_name", None),
efel_settings=feature.get("efel_settings", {}),
threshold_efeature_std=threshold_efeature_std,
default_std_value=self.default_std_value,
)

if protocol_name == "Rin":
Expand Down

0 comments on commit ca5c960

Please sign in to comment.