Fix: Fix no spike case when expected

emodel_generalisation/bluecellulab_evaluator.py

@@ -190,7 +190,7 @@ def calculate_rmp_and_rin(cell, config):
 
     if features["spike_count"] > 0:
         logger.warning("SPIKES! %s, %s", rmp, rin)
-        return 0.0, -1.0
+        return 0.0, 0.0
     return rmp, rin
 
 
@@ -281,7 +281,6 @@ def evaluate_currents(
     new_columns = [["resting_potential", 0.0], ["input_resistance", 0.0]]
     if not only_rin:
         new_columns += [["holding_current", 0.0], ["threshold_current", 0.0]]
-
     return evaluate(
         morphs_combos_df,
         _isolated_current_evaluation,

emodel_generalisation/cli.py

@@ -572,10 +572,13 @@ def assign(input_node_path, population_name, output_node_path, config_path, loca
             recipe = access_point.recipes[emodel]
             emodel_mappings[recipe["region"]][recipe["etype"]][recipe["mtype"]] = emodel
 
+    regions = list(emodel_mappings.keys())
+
     def assign_emodel(row):
         """Get emodel name to use in pandas .apply."""
         try:
-            return "hoc:" + emodel_mappings[row["region"]][row["etype"]][row["mtype"]]
+            region = [r for r in regions if r in row["region"]][0]
+            return "hoc:" + emodel_mappings[region][row["etype"]][row["mtype"]]
         except KeyError:
             return "hoc:no_emodel"
 

tests/test_cli.py

@@ -201,12 +201,12 @@ def test_adapt(cli_runner, tmpdir):
     )
     npt.assert_allclose(
         df["@dynamics:input_resistance"].to_list(),
-        [-1.0, -1.0],  # we get spikes at rest
+        [0.0, 0.0],  # we get spikes at rest
         rtol=1e-5,
     )
     npt.assert_allclose(
         df["@dynamics:holding_current"].to_list(),
-        [-0.064316, -0.081205],
+        [-0.064313, -0.081205],
         rtol=1e-5,
     )
     npt.assert_allclose(