From: albertogomcas <devnull@localhost>
Date: Wed, 27 Jan 2010 03:01:14 +0000 (+0000)
Subject: New plotmanip 'centerzero' shifts the curves to 0 force
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4daa3a74bbae1a74d13aebac34e20488af6bbb8b;p=hooke.git

New plotmanip 'centerzero' shifts the curves to 0 force
---

diff --git a/hooke.conf b/hooke.conf
index 43625b4..bda5613 100755
--- a/hooke.conf
+++ b/hooke.conf
@@ -2,7 +2,7 @@
 <!-- To comment something, put dashes and ! like here -->
 <config>
 <!-- Internal variabls. -->
-    <display ext="1" colour_ext="None" ret="1" colour_ret="None" correct="1" colour_correct="None" contact_point="0" medfilt="0" xaxes="0" yaxes="0" flatten="1" fit_function="wlc" temperature="301" auto_fit_points="50" auto_slope_span="20" auto_delta_force="10" auto_fit_nm="5" auto_min_p="0.005" auto_max_p="10" baseline_clicks="0" auto_left_baseline="20" auto_right_baseline="20" force_multiplier="1" fc_showphase="0" fc_showimposed="0" fc_interesting="0" tccd_threshold="0" tccd_coincident="0"/>
+    <display ext="1" colour_ext="None" ret="1" colour_ret="None" correct="1" colour_correct="None" contact_point="0" medfilt="0" xaxes="0" yaxes="0" flatten="1" fit_function="wlc" temperature="301" auto_fit_points="50" auto_slope_span="20" auto_delta_force="10" auto_fit_nm="5" auto_min_p="0.005" auto_max_p="10" baseline_clicks="0" auto_left_baseline="20" auto_right_baseline="20" force_multiplier="1" fc_showphase="0" fc_showimposed="0" fc_interesting="0" tccd_threshold="0" tccd_coincident="0" centerzero="1"/>
 
 <!-- 
 The following section defines your own work directory. Substitute your work directory.
@@ -66,7 +66,8 @@ and -IMPORTANTLY- their order.
     <multiplier/>
     <clamp/>
     <threshold/>
-    <coincident/>
+    <coincident/>
+    <centerzero/>
 </plotmanips>
 
 </config>
diff --git a/procplots.py b/procplots.py
index f1cc0a3..0b2b9bd 100755
--- a/procplots.py
+++ b/procplots.py
@@ -156,6 +156,41 @@ class procplotsCommands:
         plot.vectors[1][0]=[(zpoint-deflpoint) for zpoint,deflpoint in zip(plot.vectors[1][0],defl_ret)]
 
         return plot
+
+
+    def plotmanip_centerzero(self, plot, current, customvalue=None):
+        '''
+        Centers the force curve so the median (the free level) corresponds to 0 N
+        Assumes that:
+        - plot.vectors[0][1] is the Y of extension curve
+        - plot.vectors[1][1] is the Y of retraction curve
+        
+       
+        '''
+        #use only for force spectroscopy experiments!
+        if current.curve.experiment != 'smfs':
+            return plot
+    
+        if customvalue != None:
+            execute_me=customvalue
+        else:
+            execute_me=self.config['centerzero']
+        if not execute_me:
+            return plot
+     
+        
+	
+	levelapp=float(np.median(plot.vectors[0][1]))
+	levelret=float(np.median(plot.vectors[1][1]))
+
+	level=(levelapp+levelret)/2	
+
+	approach=[i-level for i in plot.vectors[0][1]]
+	retract=[i-level for i in plot.vectors[1][1]]
+	
+	plot.vectors[0][1]=approach	
+	plot.vectors[1][1]=retract	
+        return plot
     
     '''
     def plotmanip_detriggerize(self, plot, current, customvalue=None):
@@ -248,4 +283,4 @@ class procplotsCommands:
         fftplot.units=['frequency', 'power']
         plot_graph=self.list_of_events['plot_graph']       
         wx.PostEvent(self.frame,plot_graph(plots=[fftplot]))
-        
\ No newline at end of file
+