ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/osprai/osprai/trunk/converter.py
Links to HEAD: (view) (annotate)
Sticky Revision:
(Current path doesn't exist after revision 40)
Sort logs by:
Revision 25 - (view) (annotate) - [selected]
Modified Wed Apr 28 20:22:24 2010 UTC (9 years, 2 months ago) by rjaynes
File length: 35996 byte(s)
Diff to previous 6
Add py and obj files to allow modeling of more SPR experiments with converter and curvefitting modules.  This is the work of Yuhang Wan and Rui Hou.

1. In "converter.py": 
      Add the saving and reading function for the sprclass data object.
      Also add function "keyfile_read_fake" to provide default information for SPRit and ICM formats in case of the bug when do background_subtract.
      Fix the bugs in "background_subtract".
      Tested by DAM and ICM formats.
2. In model modules:
      "modelclass.py" is the parent class for all the other model classes that performs the theoretical simulating, loading and saving of the parameter or simulated data. Rui and I also add some other model modules like competing model, twostate model, parallel model, and the time variable concentrated models, where the simulated result is compared with Clamp's simulation to make sure the equations are correct. 
       The basicmodel and basicmodel_varyC class are tested. 
3. In "curvefitting.py":
      Add typical pipeline for operation. The examples are packed with the file. 
      Add function to show the Elapsed time for each fitting.
Revision 6 - (view) (annotate) - [select for diffs]
Modified Fri Apr 9 16:52:52 2010 UTC (9 years, 3 months ago) by clausted
File length: 33635 byte(s)
Diff to previous 5 , to selected 25
Added CONSTANTS to represent data file type identification integers.  These should be used throughout the code in the future to make it more readable.  Also added some default injection data to make it possible to convert a SPRit file to a CLAMP file without having an Analyte/injection file.  Also note a changed dictionary key IDcal->ID in one instance. --CGL
Revision 5 - (view) (annotate) - [select for diffs]
Modified Wed Apr 7 06:46:26 2010 UTC (9 years, 3 months ago) by clausted
File length: 33468 byte(s)
Diff to previous 3 , to selected 25
Changes made to allow use with Linux.  Can now read SPRit and output Clamp formats.  Replace == and != with "in" and "not in" string comparisons.  Change IDcal to ID in line 834.  Add function "method_read_fake" to provide default information.  Change WindowsError exception to OSError exception.  Allow user to specify default pathway for saving files by entering null string "".
Revision 3 - (view) (annotate) - [select for diffs]
Modified Tue Apr 6 05:40:47 2010 UTC (9 years, 3 months ago) by clausted
File length: 33042 byte(s)
Diff to previous 1 , to selected 25
Functions in converter are renamed to conform to python PEP8 style.  Some uppercase names have been made lowercase.
Revision 1 - (view) (annotate) - [select for diffs]
Added Wed Mar 17 05:34:43 2010 UTC (9 years, 4 months ago) by clausted
File length: 32567 byte(s)
Diff to selected 25
Initial import of Osprai project

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a