bluecellulab 2.6.63__tar.gz → 2.6.64__tar.gz

{bluecellulab-2.6.63 → bluecellulab-2.6.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluecellulab
-Version: 2.6.63
+Version: 2.6.64
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0

{bluecellulab-2.6.63 → bluecellulab-2.6.64}/bluecellulab/analysis/analysis.py

@@ -351,29 +351,32 @@ class BPAP:
         return soma_amp, dend_amps, dend_dist, apic_amps, apic_dist
 
     @staticmethod
-    def fit(soma_amp, dend_amps, dend_dist, apic_amps, apic_dist):
+    def fit(soma_amp, branch_amps, branch_dist):
         """Fit the amplitudes vs distances to an exponential decay function."""
         from scipy.optimize import curve_fit
 
-        popt_dend = None
-        if dend_amps and dend_dist:
-            dist = [0] + dend_dist  # add soma distance
-            amps = soma_amp + dend_amps  # add soma amplitude
-            popt_dend, _ = curve_fit(exp_decay, dist, amps)
-
-        popt_apic = None
-        if apic_amps and apic_dist:
-            dist = [0] + apic_dist  # add soma distance
-            amps = soma_amp + apic_amps  # add soma amplitude
-            popt_apic, _ = curve_fit(exp_decay, dist, amps)
-
-        return popt_dend, popt_apic
+        if not branch_amps or not branch_dist or len(branch_amps) != len(branch_dist):
+            return None, False
+        try:
+            dist = [0] + branch_dist
+            amps = soma_amp + branch_amps
+            popt, _ = curve_fit(exp_decay, dist, amps)
+            return popt, False
+        except RuntimeError:
+            return None, True
 
     def validate(self, soma_amp, dend_amps, dend_dist, apic_amps, apic_dist):
         """Check that the exponential fit is decaying."""
         validated = True
         notes = ""
-        popt_dend, popt_apic = self.fit(soma_amp, dend_amps, dend_dist, apic_amps, apic_dist)
+        popt_dend, dend_fit_error = self.fit(soma_amp, dend_amps, dend_dist)
+        popt_apic, apic_fit_error = self.fit(soma_amp, apic_amps, apic_dist)
+        if dend_fit_error or apic_fit_error:
+            logger.debug("Fitting error occurred.")
+            validated = False
+            notes += "Validation failed: Fitting error occurred.\n"
+            return validated, notes
+
         if dend_amps is not None:
             plt.cla()
             plt.plot([0], soma_amp, '.')
@@ -415,7 +418,8 @@ class BPAP:
         output_fname="bpap.pdf",
     ):
         """Plot the results of the BPAP analysis."""
-        popt_dend, popt_apic = self.fit(soma_amp, dend_amps, dend_dist, apic_amps, apic_dist)
+        popt_dend, _ = self.fit(soma_amp, dend_amps, dend_dist)
+        popt_apic, _ = self.fit(soma_amp, apic_amps, apic_dist)
 
         outpath = pathlib.Path(output_dir) / output_fname
         fig, ax1 = plt.subplots(figsize=(10, 6))

{bluecellulab-2.6.63 → bluecellulab-2.6.64}/bluecellulab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluecellulab
-Version: 2.6.63
+Version: 2.6.64
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0