From 02bcffbe633510f1976928aaff09d90ad1679c44 Mon Sep 17 00:00:00 2001
From: ralf <ralf.palmiste@hotmail.com>
Date: Mon, 12 Aug 2024 14:01:40 +0300
Subject: [PATCH] no idea how to stop it from plotting too many plots

---
 Model.py                          |   2 +-
 __pycache__/Model.cpython-311.pyc | Bin 15790 -> 15743 bytes
 fitter.py                         |  29 +++++++++++++++--------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Model.py b/Model.py
index aba81de..028c7d7 100644
--- a/Model.py
+++ b/Model.py
@@ -465,4 +465,4 @@ if __name__ == "__main__":
         FCa_0,  # FCa
     ]
     model.solve(initial_values=initial_values, tspan=[0, 1000], dt=1.0, times=None)
-    plt.show()
+    #plt.show()
diff --git a/__pycache__/Model.cpython-311.pyc b/__pycache__/Model.cpython-311.pyc
index 84930626ab73f40e11355f18ac45852ebf62db19..9f31ab1ee5c8d50c4a9bcad1f7ed132789085e7c 100644
GIT binary patch
delta 82
zcmZ2i{lAKLIWI340}vR!+?m!kkyny2V4`{#W75P;2R2V&d}7HcKDpF-!DMM0DXuR-
hRg6Gf9JATpCXiA10!uIueXwO<k-ESvS>y|p0sv=O81Mi9

delta 142
zcmexgwXT|XIWI340}!x1+nLrnkyny2Z=!k^W8uV22Sk_{QdzRZL6RV_42V}VY|dbO
zXUQlrIox`I)-9IejQsMVy+DZ~Ul8F9Bz|$&<mRW8=A_yceFbtEfw(w*v$RbhqudP^
ao(AU@k4CQ+uLdyuV9&rJb%9wDtQ!D8xhL`f

diff --git a/fitter.py b/fitter.py
index 17b3832..9d6f4ec 100644
--- a/fitter.py
+++ b/fitter.py
@@ -82,18 +82,18 @@ class Fitter:
         self.iteration += 1
         print(self.iteration, parameters.tolist(), "err", err)
 
-        if self.iteration < -0:
-            t = self.time_points[self.current_time_indecies]
-            plt.plot(
-                t, _calc_curr[self.current_time_indecies], label="calculated current"
-            )
-            plt.plot(t, self.measured_current, label="measured current")
-            plt.plot(t, calculated_current, label="conv calculated current")
-            plt.plot(t, self.measured_current - calculated_current, label="error")
-            plt.xlabel("time, ms")
-            plt.ylabel("current, pA/pF")
-            plt.legend(frameon=False)
-            plt.show()
+#        if self.iteration < -0:
+#            t = self.time_points[self.current_time_indecies]
+#            plt.plot(
+#                t, _calc_curr[self.current_time_indecies], label="calculated current"
+#            )
+#            plt.plot(t, self.measured_current, label="measured current")
+#            plt.plot(t, calculated_current, label="conv calculated current")
+#            plt.plot(t, self.measured_current - calculated_current, label="error")
+#            plt.xlabel("time, ms")
+#            plt.ylabel("current, pA/pF")
+#            plt.legend(frameon=False)
+#            plt.show()
 
         return res  # , measured_fluo - calculated_fluo)
 
@@ -156,7 +156,7 @@ class Fitter:
             times=self.time_points,
         )
 
-        _calc_curr = model.calculated_current()
+        _calc_curr = model.calculated_current(states, V)
         calculated_current = self.convolve_current(_calc_curr, tau=tau_RC) + offset
         print("Elapsed time:", time.time() - t0)
 
@@ -226,4 +226,5 @@ if __name__ == "__main__":
     # fig.savefig(f"{plot_filename}.png")
     # fig.savefig(f"{plot_filename}.pdf")
     fig.savefig("naidis_fit.pdf")
-    plt.show()
+    #matplotlib.pyplot.close()
+    #fig = plt.figure()