Changeset dd8ee14 in sasview


Ignore:
Timestamp:
Apr 7, 2011 1:37:32 PM (14 years ago)
Author:
Gervaise Alina <gervyh@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
078f2f2
Parents:
64e44c1
Message:

working on sansview with processing module

Location:
park_integration
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • park_integration/AbstractFitEngine.py

    r4b5bd73 rdd8ee14  
    469469 
    470470            if self.curr_thread != None : 
    471                     try: 
    472                         self.curr_thread.isquit() 
    473                     except: 
    474                         raise FitAbort,"stop leastsqr optimizer"     
     471                    if not self.curr_thread.isAlive(): 
     472                       raise FitAbort,"stop leastsqr optimizer"     
    475473        return self.res 
    476474     
  • park_integration/setup.py

    r8aaf534 rdd8ee14  
    66from distutils.core import setup, Extension 
    77 
    8  
     8import sys 
     9if len(sys.argv) == 1: 
     10    sys.argv.append('install') 
    911setup( 
    1012    name="sans.fit", 
  • park_integration/test/test_fit_line.py

    rfd6b789 rdd8ee14  
    3535        pars1= ['A','B'] 
    3636        fitter.set_model(model,1,pars1) 
    37         fitter.select_problem_for_fit(Uid=1,value=1) 
     37        fitter.select_problem_for_fit(id=1,value=1) 
    3838        result1 = fitter.fit() 
    3939        self.assert_(result1) 
     
    4747        fitter.set_data(data,1) 
    4848        fitter.set_model(model,1,pars1) 
    49         fitter.select_problem_for_fit(Uid=1,value=1) 
     49        fitter.select_problem_for_fit(id=1,value=1) 
    5050        result2 = fitter.fit() 
    5151         
     
    8888        fitter.set_data(data1,1) 
    8989        fitter.set_model(model1,1,pars1) 
    90         fitter.select_problem_for_fit(Uid=1,value=0) 
     90        fitter.select_problem_for_fit(id=1,value=0) 
    9191        fitter.set_data(data2,2) 
    9292        fitter.set_model(model2,2,pars1) 
    93         fitter.select_problem_for_fit(Uid=2,value=0) 
     93        fitter.select_problem_for_fit(id=2,value=0) 
    9494         
    9595        try: result1 = fitter.fit() 
     
    9797           assert str(msg)=="No Assembly scheduled for Scipy fitting." 
    9898        else: raise AssertError,"No error raised for scipy fitting with no model" 
    99         fitter.select_problem_for_fit(Uid=1,value=1) 
    100         fitter.select_problem_for_fit(Uid=2,value=1) 
     99        fitter.select_problem_for_fit(id=1,value=1) 
     100        fitter.select_problem_for_fit(id=2,value=1) 
    101101        try: result1 = fitter.fit() 
    102102        except RuntimeError,msg: 
     
    110110        fitter.set_data(data2,2) 
    111111        fitter.set_model(model2,2,pars1) 
    112         fitter.select_problem_for_fit(Uid=1,value=1) 
    113         fitter.select_problem_for_fit(Uid=2,value=1) 
     112        fitter.select_problem_for_fit(id=1,value=1) 
     113        fitter.select_problem_for_fit(id=2,value=1) 
    114114        result2 = fitter.fit() 
    115115         
     
    157157        fitter.set_data(data2,2,smearer=None) 
    158158        fitter.set_model(model2,2,pars2) 
    159         fitter.select_problem_for_fit(Uid=1,value=1) 
    160         fitter.select_problem_for_fit(Uid=2,value=1) 
     159        fitter.select_problem_for_fit(id=1,value=1) 
     160        fitter.select_problem_for_fit(id=2,value=1) 
    161161         
    162162        result2 = fitter.fit() 
     
    192192        fitter.set_model(model,1,pars1) 
    193193        fitter.set_data(data2,1,qmin=1,qmax=10) 
    194         fitter.select_problem_for_fit(Uid=1,value=1) 
     194        fitter.select_problem_for_fit(id=1,value=1) 
    195195         
    196196        result1 = fitter.fit() 
     
    206206        fitter.set_model(model,1,pars1) 
    207207        fitter.set_data(data2,1,qmin=1,qmax=10) 
    208         fitter.select_problem_for_fit(Uid=1,value=1) 
     208        fitter.select_problem_for_fit(id=1,value=1) 
    209209        result2 = fitter.fit() 
    210210         
Note: See TracChangeset for help on using the changeset viewer.