Changeset 91a43d0 in sasview for fittingview/src/sans


Ignore:
Timestamp:
Oct 10, 2011 2:22:45 PM (13 years ago)
Author:
Jae Cho <jhjcho@…>
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:
05fb6d12
Parents:
1fa4db39
Message:

fixed batchfit with park

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r90a2358 r91a43d0  
    803803        ## perform single fit 
    804804        if is_single_fit: 
    805             if self._fit_engine == "scipy": 
    806                 calc_fit = FitThread(handler = handler, 
     805            calc_fit = FitThread(handler = handler, 
    807806                                    fn=fitter_list, 
    808807                                    pars=pars, 
     
    812811                                    completefn=self._single_fit_completed, 
    813812                                    ftol=self.ftol) 
    814             else: 
    815                 calc_fit = FitThread(handler = handler, 
    816                                     fn=fitter_list, 
    817                                     pars=pars, 
    818                                     batch_inputs=batch_inputs, 
    819                                     batch_outputs=batch_outputs, 
    820                                     page_id=list_page_id, 
    821                                     completefn=self._simul_fit_completed, 
    822                                     ftol=self.ftol) 
    823  
    824813        else: 
    825814            current_page_id = self.sim_page.uid 
     
    10631052                                                      type="stop")) 
    10641053        pid = page_id[0] 
     1054        cpage = self.fit_panel.get_page_by_id(pid) 
     1055        batch_on = cpage.batch_on 
    10651056        if batch_outputs is None: 
    10661057            batch_outputs = {} 
    1067         if self.batch_on: 
     1058        if batch_on: 
    10681059            # format batch_outputs 
    10691060            batch_outputs["Chi2"] = [] 
Note: See TracChangeset for help on using the changeset viewer.