updated startup copyright notice

[hooke.git] / generalvclamp.py

diff --git a/generalvclamp.py b/generalvclamp.py
index 4a8cd66874ae598550b08f433875a0c9fd3ceb10..482446540f3d889d9d6e493ea5eab49143a314b8 100644 (file)
--- a/generalvclamp.py
+++ b/generalvclamp.py
@@ -44,6 +44,8 @@ class generalvclampCommands:
         else:
             dx,unitx,dy,unity=self._delta(set=1)
             print str(dx*(10**9))+' nm'
+            to_dump='distance '+self.current.path+' '+str(dx*(10**9))+' nm'
+            self.outlet.push(to_dump)
 
 
     def do_force(self,args):
@@ -59,6 +61,8 @@ class generalvclampCommands:
             return
         dx,unitx,dy,unity=self._delta(set=1)
         print str(dy*(10**12))+' pN'
+        to_dump='force '+self.current.path+' '+str(dy*(10**12))+' pN'
+        self.outlet.push(to_dump)
         
         
     def do_forcebase(self,args):
@@ -114,6 +118,8 @@ class generalvclampCommands:
         avg=np.mean(to_average)
         forcebase=abs(y-avg)
         print str(forcebase*(10**12))+' pN'
+        to_dump='forcebase '+self.current.path+' '+str(forcebase*(10**12))+' pN'
+        self.outlet.push(to_dump)
         
     
     def plotmanip_flatten(self, plot, current, customvalue=False):
@@ -146,11 +152,13 @@ class generalvclampCommands:
             max_cycles=self.config['flatten'] #Using > 1 usually doesn't help and can give artefacts. However, it could be useful too.
         
         contact_index=self.find_contact_point()
+        
         valn=[[] for item in range(max_exponent)]
         yrn=[0.0 for item in range(max_exponent)]
         errn=[0.0 for item in range(max_exponent)]
         
         for i in range(int(max_cycles)):
+            
             x_ext=plot.vectors[0][0][contact_index+delta_contact:]
             y_ext=plot.vectors[0][1][contact_index+delta_contact:]
             x_ret=plot.vectors[1][0][contact_index+delta_contact:]
@@ -224,6 +232,8 @@ class generalvclampCommands:
         # Outputs the relevant slope parameter
         print 'Slope:'
         print str(parameters[0])
+        to_dump='slope '+self.current.path+' '+str(parameters[0])
+        self.outlet.push(to_dump)
                 
         # Makes a vector with the fitted parameters and sends it to the GUI
         xtoplot=parameters[2]