projects / hooke.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eac3a60) | patch
Really hideous merge of Rolf Schmidt's code.
authorW. Trevor King <wking@drexel.edu>
Tue, 4 May 2010 15:47:17 +0000 (11:47 -0400)
committerW. Trevor King <wking@drexel.edu>
Tue, 4 May 2010 15:47:17 +0000 (11:47 -0400)
commitee0cc702f9257cf5fdfb89fea2ebf70fbde3e54a
tree23e629e1b3bd3f732e5649823aab6540cb7c821ftree | snapshot
parenteac3a60fbcd78438a435d958a371cbcf0e6edae6commit | diff
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.
32 files changed:
conf/autopeak.ini [new file with mode: 0644] blob
conf/fit.ini [new file with mode: 0644] blob
conf/flatfilts.ini [new file with mode: 0644] blob
conf/general.ini [new file with mode: 0644] blob
conf/generalvclamp.ini [new file with mode: 0644] blob
conf/hooke configspec.ini [new file with mode: 0644] blob
conf/hooke.ini [new file with mode: 0644] blob
conf/pcluster.ini [new file with mode: 0644] blob
conf/procplots.ini [new file with mode: 0644] blob
doc/GUI [new file with mode: 0644] blob
hooke/config.py [new file with mode: 0644] blob
hooke/driver/mfp1dexport.py diff | blob | history
hooke/driver/picoforce.py diff | blob | history
hooke/formatter.py [new file with mode: 0644] blob
hooke/hooke.py diff | blob | history
hooke/libhooke.py diff | blob | history
hooke/libhookecurve.py diff | blob | history
hooke/playlist.py [new file with mode: 0644] blob
hooke/plugin/__init__.py diff | blob | history
hooke/plugin/autopeak.py diff | blob | history
hooke/plugin/flatfilts-rolf.py [new file with mode: 0644] blob
hooke/plugin/generalclamp.py diff | blob | history
hooke/plugin/generalvclamp.py diff | blob | history
hooke/plugin/procplots.py diff | blob | history
hooke/plugin/showconvoluted.py [new file with mode: 0644] blob
hooke/test/test.hkp diff | blob | history
hooke/ui/gui/hookeplaylist.py [new file with mode: 0644] blob
hooke/ui/gui/hookepropertyeditor.py [new file with mode: 0644] blob
hooke/ui/gui/hookeresults.py [new file with mode: 0644] blob
hooke/ui/gui/perspectives/Default.txt [new file with mode: 0644] blob
hooke/ui/gui/prettyformat.py [new file with mode: 0644] blob
hooke/ui/gui/results.py [new file with mode: 0644] blob
Force spectroscopy data analysis with GUI and command line interfaces.