[Tobyfit-svn] r355 - in trunk/gui: . bin bin/include bin/output src/config src/cross src/fitsim src/gui/cross src/gui/fit_sim/fit src/gui/fit_sim/sim src/gui/menu src/modules_update src/tft_fl_read_write tf_models_user

[apache at svr2.nd.rl.ac.uk]

Author: Ronald Fowler
Date: Mon Feb 15 10:45:04 2010
New Revision: 355

Added:
   trunk/gui/tobyfit_local.m
      - copied unchanged from r335, /branches/gui_libisis/tobyfit_local.m
Modified:
   trunk/gui/   (props changed)
   trunk/gui/bin/Tobyfit.exe
   trunk/gui/bin/include/background_parameters.inc
   trunk/gui/bin/include/function_calls.inc
   trunk/gui/bin/include/sample_parameters.inc
   trunk/gui/bin/output/background.obj
   trunk/gui/bin/output/sqw_broad.obj
   trunk/gui/bin/output/sqw_sharp.obj
   trunk/gui/bin/tf_build_local_i11.bat
   trunk/gui/bin/tf_lib.lib
   trunk/gui/bin/tf_lib_i11.lib
   trunk/gui/src/config/tobyfit_init.m
   trunk/gui/src/cross/set_cross_section.m
   trunk/gui/src/fitsim/fitopt_ni.m
   trunk/gui/src/fitsim/simulate_tf.m
   trunk/gui/src/gui/cross/makeCrossSectionPanel.m
   trunk/gui/src/gui/cross/setCrossPPparameters.m
   trunk/gui/src/gui/fit_sim/fit/makeFitJobStatusAndResultsPanel.m
   trunk/gui/src/gui/fit_sim/sim/makeSimJobStatusAndResultsPanel.m
   trunk/gui/src/gui/menu/tf_load_tft.m
   trunk/gui/src/modules_update/tf_model_info.m
   trunk/gui/src/modules_update/tf_read_fortran_mdinfo.m
   trunk/gui/src/modules_update/tobyfit_update_models.m
   trunk/gui/src/tft_fl_read_write/data_read.m
   trunk/gui/src/tft_fl_read_write/data_write.m
   trunk/gui/src/tft_fl_read_write/tf_read_sigma.m
   trunk/gui/tf_models_user/background.f
   trunk/gui/tf_models_user/sqw_broad.f
   trunk/gui/tf_models_user/sqw_sharp.f
   trunk/gui/tobyfit.m

Log:
Merging changes from branch that exclude the change to libisis. In some cases these caused conflicts which may need to be resolved when merging final branch.

Modified: trunk/gui/bin/Tobyfit.exe
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/Tobyfit.exe?r1=354&r2=355

Modified: trunk/gui/bin/include/background_parameters.inc
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/include/background_parameters.inc?r1=354&r2=355

Modified: trunk/gui/bin/include/function_calls.inc
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/include/function_calls.inc?r1=354&r2=355

Modified: trunk/gui/bin/include/sample_parameters.inc
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/include/sample_parameters.inc?r1=354&r2=355

Modified: trunk/gui/bin/output/background.obj
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/output/background.obj?r1=354&r2=355

Modified: trunk/gui/bin/output/sqw_broad.obj
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/output/sqw_broad.obj?r1=354&r2=355

Modified: trunk/gui/bin/output/sqw_sharp.obj
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/output/sqw_sharp.obj?r1=354&r2=355

Modified: trunk/gui/bin/tf_build_local_i11.bat
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/tf_build_local_i11.bat?r1=354&r2=355

Modified: trunk/gui/bin/tf_lib.lib
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/tf_lib.lib?r1=354&r2=355

Modified: trunk/gui/bin/tf_lib_i11.lib
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/bin/tf_lib_i11.lib?r1=354&r2=355

Modified: trunk/gui/src/config/tobyfit_init.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/config/tobyfit_init.m?r1=354&r2=355

Modified: trunk/gui/src/cross/set_cross_section.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/cross/set_cross_section.m?r1=354&r2=355

Modified: trunk/gui/src/fitsim/fitopt_ni.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/fitsim/fitopt_ni.m?r1=354&r2=355

Modified: trunk/gui/src/fitsim/simulate_tf.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/fitsim/simulate_tf.m?r1=354&r2=355

Modified: trunk/gui/src/gui/cross/makeCrossSectionPanel.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/gui/cross/makeCrossSectionPanel.m?r1=354&r2=355

Modified: trunk/gui/src/gui/cross/setCrossPPparameters.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/gui/cross/setCrossPPparameters.m?r1=354&r2=355

Modified: trunk/gui/src/gui/fit_sim/fit/makeFitJobStatusAndResultsPanel.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/gui/fit_sim/fit/makeFitJobStatusAndResultsPanel.m?r1=354&r2=355

Modified: trunk/gui/src/gui/fit_sim/sim/makeSimJobStatusAndResultsPanel.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/gui/fit_sim/sim/makeSimJobStatusAndResultsPanel.m?r1=354&r2=355

Modified: trunk/gui/src/gui/menu/tf_load_tft.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/gui/menu/tf_load_tft.m?r1=354&r2=355

Modified: trunk/gui/src/modules_update/tf_model_info.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/modules_update/tf_model_info.m?r1=354&r2=355

Modified: trunk/gui/src/modules_update/tf_read_fortran_mdinfo.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/modules_update/tf_read_fortran_mdinfo.m?r1=354&r2=355

Modified: trunk/gui/src/modules_update/tobyfit_update_models.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/modules_update/tobyfit_update_models.m?r1=354&r2=355

Modified: trunk/gui/src/tft_fl_read_write/data_read.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/tft_fl_read_write/data_read.m?r1=354&r2=355

Modified: trunk/gui/src/tft_fl_read_write/data_write.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/tft_fl_read_write/data_write.m?r1=354&r2=355

Modified: trunk/gui/src/tft_fl_read_write/tf_read_sigma.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/src/tft_fl_read_write/tf_read_sigma.m?r1=354&r2=355

Modified: trunk/gui/tf_models_user/background.f
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/tf_models_user/background.f?r1=354&r2=355

Modified: trunk/gui/tf_models_user/sqw_broad.f
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/tf_models_user/sqw_broad.f?r1=354&r2=355

Modified: trunk/gui/tf_models_user/sqw_sharp.f
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/tf_models_user/sqw_sharp.f?r1=354&r2=355

Modified: trunk/gui/tobyfit.m
Url: http://svn.isis.rl.ac.uk/viewvc/Tobyfit/trunk/gui/tobyfit.m?r1=354&r2=355