From: marcobrucale <devnull@localhost>
Date: Mon, 22 Jun 2009 10:52:13 +0000 (+0000)
Subject: Just added a new config variable, "force_multiplier", which unsurprisingly muliplies... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ced26fe126bf14842c2738aeb2fadbcc3f336bb9;p=hooke.git

Just added a new config variable, "force_multiplier", which unsurprisingly muliplies each Y on an SMFS curve. Default value is 1. This is sometimes useful for calibration.
---

diff --git a/generalvclamp.py b/generalvclamp.py
index 7cccf0b..1c71de0 100644
--- a/generalvclamp.py
+++ b/generalvclamp.py
@@ -120,7 +120,33 @@ class generalvclampCommands:
         print str(forcebase*(10**12))+' pN'
         to_dump='forcebase '+self.current.path+' '+str(forcebase*(10**12))+' pN'
         self.outlet.push(to_dump)
+
+    def plotmanip_multiplier(self, plot, current):
+        '''
+        Multiplies all the Y values of an SMFS curve by a value stored in the 'force_multiplier'
+        configuration variable. Useful for calibrations and other stuff.
+        '''
+        
+        #not a smfs curve...
+        if current.curve.experiment != 'smfs':
+            return plot
+        
+        #only one set is present...
+        if len(self.plots[0].vectors) != 2:
+            return plot
         
+        #multiplier is 1...
+        if (self.config['force_multiplier']==1):
+            return plot
+
+        for i in range(len(plot.vectors[0][1])):
+            plot.vectors[0][1][i]=plot.vectors[0][1][i]*self.config['force_multiplier']        
+
+        for i in range(len(plot.vectors[1][1])):
+            plot.vectors[1][1][i]=plot.vectors[1][1][i]*self.config['force_multiplier']
+
+        return plot            
+   
     
     def plotmanip_flatten(self, plot, current, customvalue=False):
         '''
diff --git a/hooke.conf b/hooke.conf
index 6391e3b..8c72cb6 100755
--- a/hooke.conf
+++ b/hooke.conf
@@ -1,70 +1,71 @@
-<?xml version="1.0" ?>
-<!-- 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" 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" fc_showphase="0" fc_showimposed="0" fc_interesting="0" tccd_threshold="0" tccd_coincident="0"/>
-
-<!-- 
-The following section defines your own work directory. Substitute your work directory.
-     -->
-<workdir>
-    insert directory
-</workdir>
-
-<!--
-The following section defines the default playlist to load at startup.
--->
-<defaultlist>
-    test.hkp
-</defaultlist>
-
-<!--
-This section defines which plugins have to be loaded by Hooke.
-    -->
-<plugins>
-    <fit/>
-    <procplots/>
-    <flatfilts/>
-    <generalclamp/>
-    <!-- dummyguiplug/ -->
-    <!-- superimpose/ -->
-    <generalvclamp/>
-    <massanalysis/>
-    <viewer/>
-    <!-- tutorial/ -->
-    <macro/>
-    <autopeak/>
-    <pcluster/>
-    <generaltccd/>
-</plugins>
-
-<!--
-This section defines which drivers have to be loaded by Hooke.
-    -->
-<drivers>
-    <picoforce/>
-    <!-- picoforcealt/ -->
-    <hemingclamp/>
-    <csvdriver/>
-    <!-- tutorialdriver/ -->
-    <jpk/>
-    <mfp1dexport/>
-    <mcs/>
-</drivers>
-
-<!--
-This section defines which plot manipulators have to be loaded by Hooke,
-and -IMPORTANTLY- their order.
-    -->
-<plotmanips>
-    <correct/>
-    <median/>
-    <!-- absvalue/ -->
-    <flatten/>
-    <clamp/>
-    <threshold/>
-    <coincident/>
-</plotmanips>
-
-</config>
-
+<?xml version="1.0" ?>
+<!-- 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" 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"/>
+
+<!-- 
+The following section defines your own work directory. Substitute your work directory.
+     -->
+<workdir>
+    insert directory
+</workdir>
+
+<!--
+The following section defines the default playlist to load at startup.
+-->
+<defaultlist>
+    test.hkp
+</defaultlist>
+
+<!--
+This section defines which plugins have to be loaded by Hooke.
+    -->
+<plugins>
+    <fit/>
+    <procplots/>
+    <flatfilts/>
+    <generalclamp/>
+    <!-- dummyguiplug/ -->
+    <!-- superimpose/ -->
+    <generalvclamp/>
+    <massanalysis/>
+    <viewer/>
+    <!-- tutorial/ -->
+    <macro/>
+    <autopeak/>
+    <pcluster/>
+    <generaltccd/>
+</plugins>
+
+<!--
+This section defines which drivers have to be loaded by Hooke.
+    -->
+<drivers>
+    <picoforce/>
+    <!-- picoforcealt/ -->
+    <hemingclamp/>
+    <csvdriver/>
+    <!-- tutorialdriver/ -->
+    <jpk/>
+    <mfp1dexport/>
+    <mcs/>
+</drivers>
+
+<!--
+This section defines which plot manipulators have to be loaded by Hooke,
+and -IMPORTANTLY- their order.
+    -->
+<plotmanips>
+    <correct/>
+    <median/>
+    <!-- absvalue/ -->
+    <flatten/>
+    <multiplier/>
+    <clamp/>
+    <threshold/>
+    <coincident/>
+</plotmanips>
+
+</config>
+
diff --git a/libhookecurve.py b/libhookecurve.py
index 1141783..37cd1b1 100755
--- a/libhookecurve.py
+++ b/libhookecurve.py
@@ -103,7 +103,7 @@ class PlotObject:
         '''
         styles: defines what is the style of the current plots. If undefined or None, it is line plot.
         If an element of the list is 'scatter', the corresponding dataset
-	is drawn with scattered points and not a continuous line.
+        is drawn with scattered points and not a continuous line.
         '''
         self.styles=[]