hooke.git
13 years agoReally hideous merge of Rolf Schmidt's code.
W. Trevor King [Tue, 4 May 2010 15:47:17 +0000 (11:47 -0400)]
Really hideous merge of Rolf Schmidt's code.

It's hard to merge code when you're not sure which version is more
recent, what the rationale behind the changes are, or very much about
how the code is supposed to work at all ;).  I think I caught most of
the important ideas from both sides, and now I'm going to go back
through and clean things up.

13 years agoOops, fix libinput import in hooke.plugin.review. Missed it in the merge
W. Trevor King [Tue, 4 May 2010 07:23:44 +0000 (03:23 -0400)]
Oops, fix libinput import in hooke.plugin.review.  Missed it in the merge

13 years agoRemoved busy loop from hooke/plugin/flatfilts.py.
W. Trevor King [Tue, 4 May 2010 07:16:05 +0000 (03:16 -0400)]
Removed busy loop from hooke/plugin/flatfilts.py.

Perhaps it was an attempt to pause briefly?  If so, time.sleep() would
be better.  It wasn't much of a pause though:
  $ time python -c ''
  real    0m0.111s
  user    0m0.089s
  sys     0m0.020s
  $ time python -c 'for i in range(1000): k=0'
  real    0m0.115s
  user    0m0.090s
  sys     0m0.024s

13 years agoMerged with trunk
W. Trevor King [Tue, 4 May 2010 07:09:59 +0000 (03:09 -0400)]
Merged with trunk

13 years agoWLC and FJC output are now with 2 decimal precision. Added a comment on autopeak...
fabrizio.benedetti.82 [Tue, 11 May 2010 09:23:48 +0000 (09:23 +0000)]
WLC and FJC output are now with 2 decimal precision.  Added a comment on autopeak on how to use the 'manual' option

13 years agoAdded the possibility to manually choose the peaks in 'autopeak' with the option...
fabrizio.benedetti.82 [Mon, 10 May 2010 11:09:31 +0000 (11:09 +0000)]
Added the possibility to manually choose the peaks in 'autopeak' with the option 'manual'.

13 years agoCorrect number of digits of many output, improvement in the utility 'cut' and 'txt'.
fabrizio.benedetti.82 [Fri, 7 May 2010 09:07:54 +0000 (09:07 +0000)]
Correct number of digits of many output, improvement in the utility 'cut' and 'txt'.

13 years agoFixes bad call to wlc/fjc fit
albertogomcas [Thu, 6 May 2010 09:07:37 +0000 (09:07 +0000)]
Fixes bad call to wlc/fjc fit

13 years agoAdded modular directory structure.
W. Trevor King [Tue, 4 May 2010 06:41:19 +0000 (02:41 -0400)]
Added modular directory structure.

Also some import and other cleanups to convince myself that the
reorganization was mostly working.

14 years agofit.py : extended FJC fit (models water bridges of PEG in water solutions)
albertogomcas [Wed, 24 Mar 2010 15:41:09 +0000 (15:41 +0000)]
fit.py : extended FJC fit (models water bridges of PEG in water solutions)
fit quality parameter, ratio distance(fit-data)/std(flat_area)

multifit.py : WLC and eFJC as default fits
saves quality of fits

14 years agomultifit.py : slope can be measured from data or form manual points
albertogomcas [Wed, 17 Mar 2010 08:58:25 +0000 (08:58 +0000)]
multifit.py : slope can be measured from data or form manual points
tried to scale better the YNarrow

14 years agomultifit.py : slope can be measured manually
albertogomcas [Wed, 17 Mar 2010 05:09:10 +0000 (05:09 +0000)]
multifit.py : slope can be measured manually
generalvclamp.py : change color of slope line to black

14 years agomfp3d.py : the retraction speed is extracted from Velocity, not RetractVelocity
albertogomcas [Tue, 16 Mar 2010 08:39:37 +0000 (08:39 +0000)]
mfp3d.py : the retraction speed is extracted from Velocity, not RetractVelocity

14 years agomultifit.py : some graphical niceties
albertogomcas [Mon, 15 Mar 2010 05:56:37 +0000 (05:56 +0000)]
multifit.py : some graphical niceties

14 years agomultifit.py : proper formatting of help section
albertogomcas [Fri, 12 Mar 2010 06:23:26 +0000 (06:23 +0000)]
multifit.py : proper formatting of help section

14 years agomultifit.py : Fixed a wrong named var
albertogomcas [Fri, 12 Mar 2010 03:08:59 +0000 (03:08 +0000)]
multifit.py : Fixed a wrong named var
libhook.py  : Deleted deprecated message (irritates me :D)

14 years agomultifit.py : new plugin, mouse input based
albertogomcas [Thu, 11 Mar 2010 12:02:18 +0000 (12:02 +0000)]
multifit.py :    new plugin, mouse input based
generalvclamp.py : separated code from do_slope into _slope allowing use in other funtions
hooke.conf:        activate multifit plugin by default

14 years agoreview.py: fixed crash when a file is not valid
albertogomcas [Wed, 10 Mar 2010 09:03:04 +0000 (09:03 +0000)]
review.py: fixed crash when a file is not valid

14 years agoreview.py: avoided crash when displaying final stats
albertogomcas [Wed, 10 Mar 2010 05:58:50 +0000 (05:58 +0000)]
review.py: avoided crash when displaying final stats
hooke.conf:  deactivate hdf5 by default, activate native mfp3d
mfp3d.py:  adapted driver from Hooke GUI to work in this version
procplots.py: centerzero only uses last chunk of retract

FMjoin.py: utility script to put together all files from IgorPro force maps

14 years agoCorrected a bug for the command txt when it is invoked with an unvalid plot to export.
fabrizio.benedetti.82 [Tue, 9 Mar 2010 16:44:29 +0000 (16:44 +0000)]
Corrected a bug for the command txt when it is invoked with an unvalid plot to export.

14 years agoA correction on autopeak.py due to the add of curvetools.py (a self. was missing)
fabrizio.benedetti.82 [Fri, 5 Mar 2010 11:44:09 +0000 (11:44 +0000)]
A correction on autopeak.py due to the add of curvetools.py (a self. was missing)

14 years agoCorrected some bugs in the scale of graphs.
fabrizio.benedetti.82 [Mon, 1 Mar 2010 13:50:51 +0000 (13:50 +0000)]
Corrected some bugs in the scale of graphs.

14 years agoFixed some bugs
albertogomcas [Thu, 18 Feb 2010 05:38:56 +0000 (05:38 +0000)]
Fixed some bugs

14 years agoScale of axis are now in engineering format.
fabrizio.benedetti.82 [Thu, 11 Feb 2010 13:20:54 +0000 (13:20 +0000)]
Scale of axis are now in engineering format.

14 years ago(generalvclamp.py) Error checking in flatten plot manipulator - fixes issue 31
devicerandom [Wed, 10 Feb 2010 21:04:56 +0000 (21:04 +0000)]
(generalvclamp.py) Error checking in flatten plot manipulator - fixes issue 31

14 years agoreview.py plugin allows to review curves in groups of ten (à la Igor Pro), select...
albertogomcas [Fri, 5 Feb 2010 05:56:15 +0000 (05:56 +0000)]
review.py plugin allows to review curves in groups of ten (à la Igor Pro), select some of them and save to a separate directory

14 years agoAdded two plugin: jumpstat.py and multidistance.py. Change to the function has_peaks...
fabrizio.benedetti.82 [Wed, 27 Jan 2010 08:02:51 +0000 (08:02 +0000)]
Added two plugin: jumpstat.py and multidistance.py. Change to the function has_peaks. Moved some basics routines in the new file curvetools.py.

14 years agoCommand 'note' saves notes into 'hookedir/output' directory (a bit cleaner) and if...
albertogomcas [Wed, 27 Jan 2010 03:52:42 +0000 (03:52 +0000)]
Command 'note' saves notes into 'hookedir/output' directory (a bit cleaner) and if the note file exists adds instead of overwriting the file.

14 years agoNew plotmanip 'centerzero' shifts the curves to 0 force
albertogomcas [Wed, 27 Jan 2010 03:01:14 +0000 (03:01 +0000)]
New plotmanip 'centerzero' shifts the curves to 0 force

14 years agoSupport for HDF5 files created with Igor Pro (see wiki for how to create the HDF5...
albertogomcas [Fri, 22 Jan 2010 07:14:22 +0000 (07:14 +0000)]
Support for HDF5 files created with Igor Pro (see wiki for how to create the HDF5 file)

14 years agoFix: genlist can now import files without extension
albertogomcas [Fri, 22 Jan 2010 07:10:10 +0000 (07:10 +0000)]
Fix: genlist can now import files without extension

14 years agoAdded Alberto's mailing list comments about lib*.py to their docstrings.
W. Trevor King [Thu, 17 Dec 2009 21:09:51 +0000 (16:09 -0500)]
Added Alberto's mailing list comments about lib*.py to their docstrings.

From the thread:
  http://groups.google.com/group/hookesoftware/browse_thread/thread/7b893284cc317ea6#

14 years agoAdded config_dir to libhooke.HookeConfig to match new dir structure
W. Trevor King [Thu, 17 Dec 2009 20:35:25 +0000 (15:35 -0500)]
Added config_dir to libhooke.HookeConfig to match new dir structure

14 years agoAdded USAGE file based on http://code.google.com/p/hooke/wiki/BasicAnalysis
W. Trevor King [Thu, 17 Dec 2009 20:02:55 +0000 (15:02 -0500)]
Added USAGE file based on code.google.com/p/hooke/wiki/BasicAnalysis

14 years agoAll classes should at least subclass 'object' to avoid being old-style classes.
W. Trevor King [Thu, 17 Dec 2009 19:43:34 +0000 (14:43 -0500)]
All classes should at least subclass 'object' to avoid being old-style classes.

See, for example
  http://www.python.org/doc/newstyle/
  http://www.python.org/doc/2.5.2/ref/node33.html

14 years agoRemoved sha-bang from non-executable python files + whitespace cleanups.
W. Trevor King [Thu, 17 Dec 2009 19:32:21 +0000 (14:32 -0500)]
Removed sha-bang from non-executable python files + whitespace cleanups.

Whitespace cleanups mostly involved removing trailing whitespace.

14 years agoAdded README and reorganized directory structure (breaks code)
W. Trevor King [Thu, 17 Dec 2009 19:19:40 +0000 (14:19 -0500)]
Added README and reorganized directory structure (breaks code)

14 years ago(fit.py) Quick kludgy patch for crash of issue 0028
devicerandom [Thu, 19 Nov 2009 19:10:11 +0000 (19:10 +0000)]
(fit.py) Quick kludgy patch for crash of issue 0028

14 years ago(fit.py) Fixed -maybe- FJC plotting
devicerandom [Thu, 19 Nov 2009 19:01:28 +0000 (19:01 +0000)]
(fit.py) Fixed -maybe- FJC plotting

14 years ago(autopeak.py) Corrected a bug introduced in r208
fabrizio.benedetti.82 [Thu, 19 Nov 2009 11:46:40 +0000 (11:46 +0000)]
(autopeak.py) Corrected a bug introduced in r208

14 years ago(autopeak.py) Repeatedly asks for correct input.
fabrizio.benedetti.82 [Wed, 11 Nov 2009 15:08:17 +0000 (15:08 +0000)]
(autopeak.py) Repeatedly asks for correct input.

14 years agoAdded multidistance plugin.
fabrizio.benedetti.82 [Tue, 3 Nov 2009 15:44:12 +0000 (15:44 +0000)]
Added multidistance plugin.

14 years ago(autopeak.py) fixed autopeak documentation
devicerandom [Sun, 1 Nov 2009 17:39:28 +0000 (17:39 +0000)]
(autopeak.py) fixed autopeak documentation

14 years ago(autopeak.py) autopeak can now use FJC or WLC
devicerandom [Sun, 1 Nov 2009 17:20:21 +0000 (17:20 +0000)]
(autopeak.py) autopeak can now use FJC or WLC

14 years ago(fit.py) wording output is consistent with fit function used
devicerandom [Sun, 1 Nov 2009 16:51:27 +0000 (16:51 +0000)]
(fit.py) wording output is consistent with fit function used

14 years ago(fit.py) WLC and FJC now aliases of fit command
devicerandom [Sun, 1 Nov 2009 16:42:42 +0000 (16:42 +0000)]
(fit.py) WLC and FJC now aliases of fit command

14 years agoGot FJC drawing right.
devicerandom [Sat, 31 Oct 2009 22:23:58 +0000 (22:23 +0000)]
Got FJC drawing right.

14 years agoBetter plotting of FJC but not there yet
devicerandom [Sat, 31 Oct 2009 22:09:24 +0000 (22:09 +0000)]
Better plotting of FJC but not there yet

14 years agoFirst steps towards FJC support. New variable fit_function for flexible switching...
devicerandom [Sat, 31 Oct 2009 21:38:54 +0000 (21:38 +0000)]
First steps towards FJC support. New variable fit_function for flexible switching, still errors in drawing, inconsistencies etc. but the numbers in output seem sensible

14 years agoHopefully reverted to r193 after mbrucale's incident
devicerandom [Thu, 29 Oct 2009 14:57:30 +0000 (14:57 +0000)]
Hopefully reverted to r193 after mbrucale's incident

14 years ago(no commit message)
marcobrucale [Thu, 29 Oct 2009 14:43:09 +0000 (14:43 +0000)]

14 years ago(no commit message)
marcobrucale [Thu, 29 Oct 2009 14:41:17 +0000 (14:41 +0000)]

14 years agousing numpy.mean to avoid warnings; still not perfect though
devicerandom [Thu, 8 Oct 2009 18:57:56 +0000 (18:57 +0000)]
using numpy.mean to avoid warnings; still not perfect though

14 years agocorrect parsing of args of peaks command; Fixes issue 0017
devicerandom [Thu, 8 Oct 2009 18:45:14 +0000 (18:45 +0000)]
correct parsing of args of peaks command; Fixes issue 0017

14 years agoadded cut.py plugin (by Fabrizio Benedetti, EPFL, Lausanne)
devicerandom [Fri, 28 Aug 2009 12:12:09 +0000 (12:12 +0000)]
added cut.py plugin (by Fabrizio Benedetti, EPFL, Lausanne)

14 years agodeleted spurious empty dir from tree
devicerandom [Mon, 10 Aug 2009 22:18:17 +0000 (22:18 +0000)]
deleted spurious empty dir from tree

14 years agofixed: plot does not display on Windows at program launch (troubleshooting issue 1)
illysam [Fri, 7 Aug 2009 13:21:48 +0000 (13:21 +0000)]
fixed: plot does not display on Windows at program launch (troubleshooting issue 1)
fixed: driver tries to open a directory (issue 15)

14 years agofixed counter issue
illysam [Fri, 31 Jul 2009 19:39:18 +0000 (19:39 +0000)]
fixed counter issue

14 years agoFixed MFP1D export from Igor 4 (wavenote was not complete)
illysam [Wed, 29 Jul 2009 17:19:47 +0000 (17:19 +0000)]
Fixed MFP1D export from Igor 4 (wavenote was not complete)

14 years ago(no commit message)
illysam [Wed, 29 Jul 2009 13:34:33 +0000 (13:34 +0000)]

14 years agoadding a folder creation with the good plot files inside
pancaldi.paolo [Fri, 24 Jul 2009 18:24:38 +0000 (18:24 +0000)]
adding a folder creation with the good plot files inside

14 years ago(hooke_cli.py) text export, now with measure units. Fixes issue 0014
devicerandom [Fri, 24 Jul 2009 14:58:44 +0000 (14:58 +0000)]
(hooke_cli.py) text export, now with measure units. Fixes issue 0014

14 years ago(mfp1dexport.py) Fixed k determination, at least until we find news on the mysteries...
devicerandom [Fri, 24 Jul 2009 14:35:36 +0000 (14:35 +0000)]
(mfp1dexport.py) Fixed k determination, at least until we find news on the mysteries of mfp export

14 years ago(mfp1dexport.py) Fixed trivial bug in K determination ; fixed optimistic __init__...
devicerandom [Fri, 24 Jul 2009 14:12:19 +0000 (14:12 +0000)]
(mfp1dexport.py) Fixed trivial bug in K determination ; fixed optimistic __init__ leading to random crashes

14 years ago(hooke_cli.py) fixed export - bug 0011
devicerandom [Fri, 3 Jul 2009 17:55:00 +0000 (17:55 +0000)]
(hooke_cli.py) fixed export - bug 0011

14 years agopCluster ver.1 ... working! oneClick style. Updated with automatic filter calculation.
pancaldi.paolo [Wed, 1 Jul 2009 23:10:06 +0000 (23:10 +0000)]
pCluster ver.1 ... working! oneClick style. Updated with automatic filter calculation.

14 years agoUpdated with "debug" option and some explanation.
pancaldi.paolo [Wed, 1 Jul 2009 23:04:44 +0000 (23:04 +0000)]
Updated with "debug" option and some explanation.
Maybe the last update!

14 years ago(mfp_igor_scripts) Scripts committed
devicerandom [Mon, 29 Jun 2009 20:21:41 +0000 (20:21 +0000)]
(mfp_igor_scripts) Scripts committed

14 years ago(mfp1dexport.py , mfp_igor_scripts) Initial indirect support for the MFP1D Asylum...
devicerandom [Mon, 29 Jun 2009 20:16:20 +0000 (20:16 +0000)]
(mfp1dexport.py , mfp_igor_scripts) Initial indirect support for the MFP1D Asylum microscope files, via exporting scripts

14 years agopcluster improved with density estimation and second PCA. next step will be to clean...
pancaldi.paolo [Fri, 26 Jun 2009 14:45:09 +0000 (14:45 +0000)]
pcluster improved with density estimation and second PCA. next step will be to clean everything in order to use pCluster in oneClick style!

14 years agoupdated with density limit
pancaldi.paolo [Fri, 26 Jun 2009 14:21:04 +0000 (14:21 +0000)]
updated with density limit

14 years agoJust added a new config variable, "force_multiplier", which unsurprisingly muliplies...
marcobrucale [Mon, 22 Jun 2009 10:52:13 +0000 (10:52 +0000)]
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.

14 years ago(autopeak.py, etc.) added noflatten option to autopeak, plus small stuff here and...
devicerandom [Tue, 26 May 2009 16:32:47 +0000 (16:32 +0000)]
(autopeak.py, etc.) added noflatten option to autopeak, plus small stuff here and there

14 years ago(mcs.py) lower- and upper- case both working
devicerandom [Wed, 20 May 2009 11:35:11 +0000 (11:35 +0000)]
(mcs.py) lower- and upper- case both working

14 years ago(mcs.py , generaltccd.py) added first version of TCCD driver and utilities
devicerandom [Thu, 7 May 2009 11:25:23 +0000 (11:25 +0000)]
(mcs.py , generaltccd.py) added first version of TCCD driver and utilities

14 years agoAdded a small feature in the 'autopeak' command. If the variable 'baseline_clicks...
marcobrucale [Thu, 30 Apr 2009 10:21:49 +0000 (10:21 +0000)]
Added a small feature in the 'autopeak' command. If the variable 'baseline_clicks' is set to -1, no baseline is calculated. Rather, the ordinate of the contact point (either hand-picked or automatically found depending on other autopeak arguments) is taken as the zero force point.

15 years agoadd doublepca and triplepca functions
pancaldi.paolo [Fri, 24 Apr 2009 14:00:42 +0000 (14:00 +0000)]
add doublepca and triplepca functions

15 years ago(autopeak.py, flatfilts.py, hooke_cli.py) various error checkings
devicerandom [Fri, 20 Mar 2009 16:26:38 +0000 (16:26 +0000)]
(autopeak.py, flatfilts.py, hooke_cli.py) various error checkings

15 years agoPCA improved: it takes columns and multiplier factor from pca_config.txt or from...
pancaldi.paolo [Fri, 13 Mar 2009 01:29:23 +0000 (01:29 +0000)]
PCA improved: it takes columns and multiplier factor from pca_config.txt or from second argument, and save a png file.
new MULTIPCA function: multiply selected column for values 1-100 and save all plots.

15 years ago(tutorial.py) updated plugin tutorial
devicerandom [Wed, 11 Mar 2009 16:04:39 +0000 (16:04 +0000)]
(tutorial.py) updated plugin tutorial

15 years agonothing of important (new function for building a file's coordinate)
pancaldi.paolo [Wed, 11 Mar 2009 14:31:34 +0000 (14:31 +0000)]
nothing of important (new function for building a file's coordinate)

15 years ago(pcluster.py) again, dirty stuff for testing
devicerandom [Mon, 9 Mar 2009 19:37:43 +0000 (19:37 +0000)]
(pcluster.py) again, dirty stuff for testing

15 years agoadd file configuration in order to choice the pca's columns
pancaldi.paolo [Mon, 9 Mar 2009 15:33:21 +0000 (15:33 +0000)]
add file configuration in order to choice the pca's columns

15 years agoconfiguration file for pca's columns
pancaldi.paolo [Mon, 9 Mar 2009 15:32:02 +0000 (15:32 +0000)]
configuration file for pca's columns

15 years ago(pcluster.py) testing stuff for test datasets
devicerandom [Fri, 6 Mar 2009 15:22:04 +0000 (15:22 +0000)]
(pcluster.py) testing stuff for test datasets

15 years ago(pcluster.py) fixed typo
devicerandom [Wed, 4 Mar 2009 19:32:14 +0000 (19:32 +0000)]
(pcluster.py) fixed typo

15 years agofixed many importants bugs: flatten, c_leng(ths) and p_leng(ths)
pancaldi.paolo [Wed, 4 Mar 2009 19:21:49 +0000 (19:21 +0000)]
fixed many importants bugs: flatten, c_leng(ths) and p_leng(ths)

15 years ago(pcluster.py) fixed stupid crash
devicerandom [Wed, 4 Mar 2009 14:08:34 +0000 (14:08 +0000)]
(pcluster.py) fixed stupid crash

15 years agolittle changing in the list of clustering coordinates (columns view)
pancaldi.paolo [Wed, 4 Mar 2009 13:47:21 +0000 (13:47 +0000)]
little changing in the list of clustering coordinates (columns view)

15 years ago(flatfilts.py) fixed peaks command crashing (pcluster.py) fixed contact point determi...
devicerandom [Wed, 4 Mar 2009 13:07:50 +0000 (13:07 +0000)]
(flatfilts.py) fixed peaks command crashing (pcluster.py) fixed contact point determination

15 years ago(autopeak.py) fixed stuff about color management
devicerandom [Tue, 3 Mar 2009 17:58:58 +0000 (17:58 +0000)]
(autopeak.py) fixed stuff about color management

15 years ago(generalvclamp.py) now linefit_between accepts whatset
devicerandom [Tue, 3 Mar 2009 15:58:29 +0000 (15:58 +0000)]
(generalvclamp.py) now linefit_between accepts whatset

15 years ago(libhookecurve.py, hooke.py , fit.py, generalvclamp.py) Added color attribute to...
devicerandom [Tue, 3 Mar 2009 15:14:03 +0000 (15:14 +0000)]
(libhookecurve.py, hooke.py , fit.py, generalvclamp.py) Added color attribute to the PlotObject

15 years ago(pcluster.py) temporary things for quick and dirty testing
devicerandom [Tue, 3 Mar 2009 14:30:14 +0000 (14:30 +0000)]
(pcluster.py) temporary things for quick and dirty testing

15 years ago(hooke.py) scatter_red patch to have red scatterplot
devicerandom [Tue, 3 Mar 2009 14:23:25 +0000 (14:23 +0000)]
(hooke.py) scatter_red patch to have red scatterplot

15 years ago(pcluster.py) last version by paolo
devicerandom [Tue, 3 Mar 2009 13:35:23 +0000 (13:35 +0000)]
(pcluster.py) last version by paolo

15 years ago(libhooke.py) fixed stupid algorithm for finding nearest contact point
devicerandom [Mon, 2 Mar 2009 15:52:26 +0000 (15:52 +0000)]
(libhooke.py) fixed stupid algorithm for finding nearest contact point

15 years ago(generalvclamp.py) error checking in slope command
devicerandom [Mon, 2 Mar 2009 13:36:42 +0000 (13:36 +0000)]
(generalvclamp.py) error checking in slope command

15 years ago(pcluster.py) fixed scatterplot of pca
devicerandom [Mon, 2 Mar 2009 13:31:14 +0000 (13:31 +0000)]
(pcluster.py) fixed scatterplot of pca

15 years ago(pcluster.py) still trying stuff
devicerandom [Mon, 2 Mar 2009 08:51:42 +0000 (08:51 +0000)]
(pcluster.py) still trying stuff